From 6899a098aea309a9c9699cb63fbe6e8aa51a830e Mon Sep 17 00:00:00 2001 From: Packit Service Date: Dec 09 2020 23:59:55 +0000 Subject: opa-fm-10.10.3.0.11 base --- diff --git a/CommonInstall/Makefile b/CommonInstall/Makefile index 31fb1a3..2f11768 100644 --- a/CommonInstall/Makefile +++ b/CommonInstall/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for OPENIB_HOST Project @@ -97,11 +97,11 @@ CLEAN_TARGETS_MISC = CLEAN_TARGETS = $(OBJECTS) $(RSCOBJECTS) $(IDL_TARGETS) $(CLEAN_TARGETS_MISC) # other files to remove during clobber phase CLOBBER_TARGETS_MISC= comp_ff_of_prereq_RHEL72.pl comp_ff_of_prereq_RHEL73.pl comp_ff_of_prereq_RHEL74.pl comp_ff_of_prereq_RHEL75.pl comp_ff_of_prereq_RHEL76.pl \ - comp_ff_of_prereq_RHEL77.pl comp_ff_of_prereq_RHEL8.pl comp_ff_of_prereq_RHEL81.pl \ - comp_ff_of_prereq_SLES122.pl comp_ff_of_prereq_SLES123.pl comp_ff_of_prereq_SLES124.pl comp_ff_of_prereq_SLES15.pl comp_ff_of_prereq_SLES151.pl \ + comp_ff_of_prereq_RHEL77.pl comp_ff_of_prereq_RHEL8.pl comp_ff_of_prereq_RHEL81.pl comp_ff_of_prereq_RHEL82.pl comp_ff_of_prereq_SLES122.pl \ + comp_ff_of_prereq_SLES123.pl comp_ff_of_prereq_SLES124.pl comp_ff_of_prereq_SLES15.pl comp_ff_of_prereq_SLES151.pl comp_ff_of_prereq_SLES152.pl \ comp_fm_prereq_RHEL72.pl comp_fm_prereq_RHEL73.pl comp_fm_prereq_RHEL74.pl comp_fm_prereq_RHEL75.pl comp_fm_prereq_RHEL76.pl comp_fm_prereq_RHEL77.pl \ - comp_fm_prereq_RHEL8.pl comp_fm_prereq_RHEL81.pl comp_fm_prereq_SLES122.pl comp_fm_prereq_SLES123.pl comp_fm_prereq_SLES124.pl comp_fm_prereq_SLES15.pl \ - comp_fm_prereq_SLES151.pl + comp_fm_prereq_RHEL8.pl comp_fm_prereq_RHEL81.pl comp_fm_prereq_RHEL82.pl comp_fm_prereq_SLES122.pl comp_fm_prereq_SLES123.pl comp_fm_prereq_SLES124.pl \ + comp_fm_prereq_SLES15.pl comp_fm_prereq_SLES151.pl comp_fm_prereq_SLES152.pl # sub-directory to install to within bin BIN_SUBDIR = # sub-directory to install to within include @@ -128,13 +128,15 @@ INCLUDE_SUBDIR = LOCALDEPLIBS = FF_FILES = comp_ff_of_prereq_RHEL72.pl comp_ff_of_prereq_RHEL73.pl comp_ff_of_prereq_RHEL74.pl \ - comp_ff_of_prereq_RHEL75.pl comp_ff_of_prereq_RHEL76.pl comp_ff_of_prereq_RHEL77.pl comp_ff_of_prereq_RHEL8.pl comp_ff_of_prereq_RHEL81.pl \ + comp_ff_of_prereq_RHEL75.pl comp_ff_of_prereq_RHEL76.pl comp_ff_of_prereq_RHEL77.pl comp_ff_of_prereq_RHEL78.pl \ + comp_ff_of_prereq_RHEL8.pl comp_ff_of_prereq_RHEL81.pl comp_ff_of_prereq_RHEL82.pl \ comp_ff_of_prereq_SLES122.pl comp_ff_of_prereq_SLES123.pl comp_ff_of_prereq_SLES124.pl \ - comp_ff_of_prereq_SLES15.pl comp_ff_of_prereq_SLES151.pl + comp_ff_of_prereq_SLES15.pl comp_ff_of_prereq_SLES151.pl comp_ff_of_prereq_SLES152.pl FM_FILES = comp_fm_prereq_RHEL72.pl comp_fm_prereq_RHEL73.pl comp_fm_prereq_RHEL74.pl \ - comp_fm_prereq_RHEL75.pl comp_fm_prereq_RHEL76.pl comp_fm_prereq_RHEL77.pl comp_fm_prereq_RHEL8.pl comp_fm_prereq_RHEL81.pl \ + comp_fm_prereq_RHEL75.pl comp_fm_prereq_RHEL76.pl comp_fm_prereq_RHEL77.pl comp_fm_prereq_RHEL78.pl \ + comp_fm_prereq_RHEL8.pl comp_fm_prereq_RHEL81.pl comp_fm_prereq_RHEL82.pl \ comp_fm_prereq_SLES122.pl comp_fm_prereq_SLES123.pl comp_fm_prereq_SLES124.pl \ - comp_fm_prereq_SLES15.pl comp_fm_prereq_SLES151.pl + comp_fm_prereq_SLES15.pl comp_fm_prereq_SLES151.pl comp_fm_prereq_SLES152.pl # Include Make Rules definitions and rules include $(TL_DIR)/$(PROJ_FILE_DIR)/Makerules.project diff --git a/CommonInstall/comp_delta.pl b/CommonInstall/comp_delta.pl index 5e280e8..42f84c8 100755 --- a/CommonInstall/comp_delta.pl +++ b/CommonInstall/comp_delta.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl # BEGIN_ICS_COPYRIGHT8 -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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 # This file incorporates work covered by the following copyright and permission notice @@ -76,13 +76,16 @@ my @delta_kernel_srpms_sles12_sp4 = ( 'ifs-kernel-updates-kmp-default' ); my @delta_kernel_srpms_sles12_sp5 = ( 'ifs-kernel-updates-kmp-default' ); my @delta_kernel_srpms_sles15 = ( 'ifs-kernel-updates-kmp-default' ); my @delta_kernel_srpms_sles15_sp1 = ( 'ifs-kernel-updates-kmp-default' ); +my @delta_kernel_srpms_sles15_sp2 = ( 'ifs-kernel-updates-kmp-default' ); my @delta_kernel_srpms_rhel73 = ( 'kmod-ifs-kernel-updates' ); my @delta_kernel_srpms_rhel74 = ( 'kmod-ifs-kernel-updates' ); my @delta_kernel_srpms_rhel75 = ( 'kmod-ifs-kernel-updates' ); my @delta_kernel_srpms_rhel76 = ( 'kmod-ifs-kernel-updates' ); my @delta_kernel_srpms_rhel77 = ( 'kmod-ifs-kernel-updates' ); +my @delta_kernel_srpms_rhel78 = ( 'kmod-ifs-kernel-updates' ); my @delta_kernel_srpms_rhel8 = ( 'kmod-ifs-kernel-updates' ); my @delta_kernel_srpms_rhel81 = ( 'kmod-ifs-kernel-updates' ); +my @delta_kernel_srpms_rhel82 = ( 'kmod-ifs-kernel-updates' ); my @delta_kernel_srpms = ( ); # This provides information for all kernel srpms @@ -157,16 +160,23 @@ sub init_delta_info($) } elsif ("$CUR_DISTRO_VENDOR" eq 'SuSE' && "$CUR_VENDOR_VER" eq 'ES151') { @delta_kernel_srpms = ( @delta_kernel_srpms_sles15_sp1 ); + } elsif ("$CUR_DISTRO_VENDOR" eq 'SuSE' + && "$CUR_VENDOR_VER" eq 'ES152') { + @delta_kernel_srpms = ( @delta_kernel_srpms_sles15_sp2 ); } elsif ( "$CUR_VENDOR_VER" eq "ES74" ) { if ($HFI2_INSTALL) { @delta_kernel_srpms = (@delta_kernel_srpms_rhel74_hfi2); } else { @delta_kernel_srpms = (@delta_kernel_srpms_rhel74); } + } elsif ( "$CUR_VENDOR_VER" eq "ES82" ) { + @delta_kernel_srpms = ( @delta_kernel_srpms_rhel82 ); } elsif ( "$CUR_VENDOR_VER" eq "ES81" ) { @delta_kernel_srpms = ( @delta_kernel_srpms_rhel81 ); } elsif ( "$CUR_VENDOR_VER" eq "ES8" ) { @delta_kernel_srpms = ( @delta_kernel_srpms_rhel8 ); + } elsif ( "$CUR_VENDOR_VER" eq "ES78" ) { + @delta_kernel_srpms = ( @delta_kernel_srpms_rhel78 ); } elsif ( "$CUR_VENDOR_VER" eq "ES77" ) { @delta_kernel_srpms = ( @delta_kernel_srpms_rhel77 ); } elsif ( "$CUR_VENDOR_VER" eq "ES76" ) { @@ -226,7 +236,7 @@ sub delta_srpm_file($$) $result = file_glob("$srcdir/$SRPMS_SUBDIR/CUDA/$globname"); } else { NormalPrint("CUDA specific SRPMs do not exist\n"); - exit 0; + exit 1; } } else { $result = file_glob("$srcdir/$SRPMS_SUBDIR/$globname"); @@ -265,7 +275,7 @@ sub get_rpms_dir_delta($) $rpmsdir=$rpmsdir."/CUDA"; } else { NormalPrint("CUDA specific packages do not exist\n"); - exit 0; + exit 1; } } return $rpmsdir; @@ -796,12 +806,18 @@ sub installed_delta_opa_stack() return ( has_version_delta() && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER)); } + } elsif ( "$CUR_VENDOR_VER" eq "ES82" ) { + return ( has_version_delta() + && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER)); } elsif ( "$CUR_VENDOR_VER" eq "ES81" ) { return ( has_version_delta() && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER)); } elsif ( "$CUR_VENDOR_VER" eq "ES8" ) { return ( has_version_delta() && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER)); + } elsif ( "$CUR_VENDOR_VER" eq "ES78" ) { + return ( has_version_delta() + && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER)); } elsif ( "$CUR_VENDOR_VER" eq "ES77" ) { return ( has_version_delta() && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER)); @@ -829,6 +845,9 @@ sub installed_delta_opa_stack() } elsif ( "$CUR_VENDOR_VER" eq 'ES151' ) { return ( has_version_delta() && rpm_is_installed("ifs-kernel-updates-kmp-default", $CUR_OS_VER)); + } elsif ( "$CUR_VENDOR_VER" eq 'ES152' ) { + return ( has_version_delta() + && rpm_is_installed("ifs-kernel-updates-kmp-default", $CUR_OS_VER)); } else { return 0; } @@ -1120,12 +1139,18 @@ sub installed_intel_hfi() } elsif ( "$CUR_VENDOR_VER" eq "ES77" ) { return (has_version_delta() && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER)); + } elsif ( "$CUR_VENDOR_VER" eq "ES78" ) { + return (has_version_delta() + && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER)); } elsif ( "$CUR_VENDOR_VER" eq "ES8" ) { return (has_version_delta() && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER)); } elsif ( "$CUR_VENDOR_VER" eq "ES81" ) { return (has_version_delta() && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER)); + } elsif ( "$CUR_VENDOR_VER" eq "ES82" ) { + 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)); @@ -1141,6 +1166,9 @@ sub installed_intel_hfi() } elsif ( "$CUR_VENDOR_VER" eq "ES151" ) { return (has_version_delta() && rpm_is_installed("ifs-kernel-updates-kmp-default", $CUR_OS_VER)); + } elsif ( "$CUR_VENDOR_VER" eq "ES152" ) { + return (has_version_delta() + && rpm_is_installed("ifs-kernel-updates-kmp-default", $CUR_OS_VER)); } else { return 0; } diff --git a/CommonInstall/comp_delta_prereq_RHEL72.pl b/CommonInstall/comp_delta_prereq_RHEL72.pl index 5a9012f..727e905 100644 --- a/CommonInstall/comp_delta_prereq_RHEL72.pl +++ b/CommonInstall/comp_delta_prereq_RHEL72.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_delta_prereq_RHEL73.pl b/CommonInstall/comp_delta_prereq_RHEL73.pl index a2b29cf..c694738 100644 --- a/CommonInstall/comp_delta_prereq_RHEL73.pl +++ b/CommonInstall/comp_delta_prereq_RHEL73.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_delta_prereq_RHEL74.pl b/CommonInstall/comp_delta_prereq_RHEL74.pl index a7a3a2a..86f7777 100644 --- a/CommonInstall/comp_delta_prereq_RHEL74.pl +++ b/CommonInstall/comp_delta_prereq_RHEL74.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_delta_prereq_RHEL75.pl b/CommonInstall/comp_delta_prereq_RHEL75.pl index 9bc57e0..b4ddacc 100644 --- a/CommonInstall/comp_delta_prereq_RHEL75.pl +++ b/CommonInstall/comp_delta_prereq_RHEL75.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_delta_prereq_RHEL76.pl b/CommonInstall/comp_delta_prereq_RHEL76.pl index 8125735..14ccab7 100644 --- a/CommonInstall/comp_delta_prereq_RHEL76.pl +++ b/CommonInstall/comp_delta_prereq_RHEL76.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_delta_prereq_RHEL77.pl b/CommonInstall/comp_delta_prereq_RHEL77.pl index 8125735..14ccab7 100644 --- a/CommonInstall/comp_delta_prereq_RHEL77.pl +++ b/CommonInstall/comp_delta_prereq_RHEL77.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_delta_prereq_RHEL78.pl b/CommonInstall/comp_delta_prereq_RHEL78.pl new file mode 100644 index 0000000..14ccab7 --- /dev/null +++ b/CommonInstall/comp_delta_prereq_RHEL78.pl @@ -0,0 +1,138 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# +# 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", + "python", + "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", + "pkgconfig", + "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", + "infinipath-psm", + "libgcc", + "libgfortran", + "gcc-gfortran", + "libgomp", + "libibverbs", + "libquadmath", + "librdmacm", + "libstdc++", + "libstdc++-devel", + "opensm-libs", + "pkgconfig", + "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 --git a/CommonInstall/comp_delta_prereq_RHEL8.pl b/CommonInstall/comp_delta_prereq_RHEL8.pl index 804443d..9df64a9 100644 --- a/CommonInstall/comp_delta_prereq_RHEL8.pl +++ b/CommonInstall/comp_delta_prereq_RHEL8.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2019, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_delta_prereq_RHEL81.pl b/CommonInstall/comp_delta_prereq_RHEL81.pl index 804443d..9df64a9 100644 --- a/CommonInstall/comp_delta_prereq_RHEL81.pl +++ b/CommonInstall/comp_delta_prereq_RHEL81.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2019, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_delta_prereq_RHEL82.pl b/CommonInstall/comp_delta_prereq_RHEL82.pl new file mode 100644 index 0000000..9df64a9 --- /dev/null +++ b/CommonInstall/comp_delta_prereq_RHEL82.pl @@ -0,0 +1,137 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# +# 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", + "python2", + "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 --git a/CommonInstall/comp_delta_prereq_SLES122.pl b/CommonInstall/comp_delta_prereq_SLES122.pl index 7b44ffd..939ac30 100644 --- a/CommonInstall/comp_delta_prereq_SLES122.pl +++ b/CommonInstall/comp_delta_prereq_SLES122.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_delta_prereq_SLES123.pl b/CommonInstall/comp_delta_prereq_SLES123.pl index 29b1c1f..46a4158 100644 --- a/CommonInstall/comp_delta_prereq_SLES123.pl +++ b/CommonInstall/comp_delta_prereq_SLES123.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_delta_prereq_SLES124.pl b/CommonInstall/comp_delta_prereq_SLES124.pl index 9fe4f42..5d1bcc0 100644 --- a/CommonInstall/comp_delta_prereq_SLES124.pl +++ b/CommonInstall/comp_delta_prereq_SLES124.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_delta_prereq_SLES125.pl b/CommonInstall/comp_delta_prereq_SLES125.pl index 2577582..6d7cec1 100644 --- a/CommonInstall/comp_delta_prereq_SLES125.pl +++ b/CommonInstall/comp_delta_prereq_SLES125.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_delta_prereq_SLES15.pl b/CommonInstall/comp_delta_prereq_SLES15.pl index 305f034..32d66fb 100644 --- a/CommonInstall/comp_delta_prereq_SLES15.pl +++ b/CommonInstall/comp_delta_prereq_SLES15.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** # -# Copyright (c) 2015-2017, Intel Corporation +# Copyright (c) 2015-2020, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_delta_prereq_SLES151.pl b/CommonInstall/comp_delta_prereq_SLES151.pl index 172a3ca..60aeb98 100644 --- a/CommonInstall/comp_delta_prereq_SLES151.pl +++ b/CommonInstall/comp_delta_prereq_SLES151.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** # -# Copyright (c) 2015-2019, Intel Corporation +# Copyright (c) 2015-2020, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_delta_prereq_SLES152.pl b/CommonInstall/comp_delta_prereq_SLES152.pl new file mode 100644 index 0000000..ccac779 --- /dev/null +++ b/CommonInstall/comp_delta_prereq_SLES152.pl @@ -0,0 +1,138 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# +# 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", + "kmod", + "rdma-core", + "rdma-ndd", + "systemd", + "coreutils", + "grep", + "libosmcomp5", + "libibmad5", + "libibumad3", + "rdma-core-devel", +); +$comp_prereq_hash{'opa_stack_prereq'} = \@opa_stack_prereq; + +my @intel_hfi_prereq = ( + "glibc", + "libgcc_s1", + "bash", + "udev", + "libudev-devel", + "python-base", + "libedit0", + "libncurses6", + "libnuma1", + "irqbalance", + "libatomic1", +); +$comp_prereq_hash{'intel_hfi_prereq'} = \@intel_hfi_prereq; + +my @mvapich2_gcc_hfi_prereq = ( + "bash", + "glibc", + "libz1", + "mpi-selector", +); +$comp_prereq_hash{'mvapich2_gcc_hfi_prereq'} = \@mvapich2_gcc_hfi_prereq; + +my @mvapich2_intel_hfi_prereq = ( + "bash", + "mpi-selector", +); +$comp_prereq_hash{'mvapich2_intel_hfi_prereq'} = \@mvapich2_intel_hfi_prereq; + +my @openmpi_gcc_hfi_prereq = ( + "glibc", + "bash", + "libpsm_infinipath1", + "pkg-config", + "libgcc_s1", + "libgfortran4", + "gcc-fortran", + "libgomp1", + "libibverbs1", + "libquadmath0", + "librdmacm1", + "libstdc++6", + "libz1", + "opensm-devel", + "mpi-selector", +); +$comp_prereq_hash{'openmpi_gcc_hfi_prereq'} = \@openmpi_gcc_hfi_prereq; + +my @openmpi_intel_hfi_prereq = ( + "bash", + "mpi-selector", +); +$comp_prereq_hash{'openmpi_intel_hfi_prereq'} = \@openmpi_intel_hfi_prereq; + +my @mvapich2_prereq = ( + "bash", + "libibverbs1", + "librdmacm1", + "glibc", + "libz1", + "mpi-selector", +); +$comp_prereq_hash{'mvapich2_prereq'} = \@mvapich2_prereq; + +my @openmpi_prereq = ( + "glibc", + "bash", + "libz1", + "pkg-config", + "libgcc_s1", + "libgfortran3", + "gcc-fortran", + "libgomp1", + "libibverbs1", + "libquadmath0", + "librdmacm1", + "libstdc++6", + "libz1", + "opensm-libs3", + "opensm-devel", + "mpi-selector", +); +$comp_prereq_hash{'openmpi_prereq'} = \@openmpi_prereq; diff --git a/CommonInstall/comp_fastfabric.pl b/CommonInstall/comp_fastfabric.pl index 1838e53..9737be0 100755 --- a/CommonInstall/comp_fastfabric.pl +++ b/CommonInstall/comp_fastfabric.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_ff_of_prereq_RHEL72.pl b/CommonInstall/comp_ff_of_prereq_RHEL72.pl index 7107407..541e71f 100644 --- a/CommonInstall/comp_ff_of_prereq_RHEL72.pl +++ b/CommonInstall/comp_ff_of_prereq_RHEL72.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_ff_of_prereq_RHEL72.pl.base b/CommonInstall/comp_ff_of_prereq_RHEL72.pl.base index 7107407..541e71f 100644 --- a/CommonInstall/comp_ff_of_prereq_RHEL72.pl.base +++ b/CommonInstall/comp_ff_of_prereq_RHEL72.pl.base @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_ff_of_prereq_RHEL73.pl b/CommonInstall/comp_ff_of_prereq_RHEL73.pl index 407d31a..c5fcbfe 100644 --- a/CommonInstall/comp_ff_of_prereq_RHEL73.pl +++ b/CommonInstall/comp_ff_of_prereq_RHEL73.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_ff_of_prereq_RHEL73.pl.base b/CommonInstall/comp_ff_of_prereq_RHEL73.pl.base index 407d31a..c5fcbfe 100644 --- a/CommonInstall/comp_ff_of_prereq_RHEL73.pl.base +++ b/CommonInstall/comp_ff_of_prereq_RHEL73.pl.base @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_ff_of_prereq_RHEL74.pl b/CommonInstall/comp_ff_of_prereq_RHEL74.pl index c45e66c..c960e74 100644 --- a/CommonInstall/comp_ff_of_prereq_RHEL74.pl +++ b/CommonInstall/comp_ff_of_prereq_RHEL74.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_ff_of_prereq_RHEL74.pl.base b/CommonInstall/comp_ff_of_prereq_RHEL74.pl.base index c45e66c..c960e74 100644 --- a/CommonInstall/comp_ff_of_prereq_RHEL74.pl.base +++ b/CommonInstall/comp_ff_of_prereq_RHEL74.pl.base @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_ff_of_prereq_RHEL75.pl b/CommonInstall/comp_ff_of_prereq_RHEL75.pl index 591bbff..49d4bd1 100644 --- a/CommonInstall/comp_ff_of_prereq_RHEL75.pl +++ b/CommonInstall/comp_ff_of_prereq_RHEL75.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_ff_of_prereq_RHEL75.pl.base b/CommonInstall/comp_ff_of_prereq_RHEL75.pl.base index 591bbff..49d4bd1 100644 --- a/CommonInstall/comp_ff_of_prereq_RHEL75.pl.base +++ b/CommonInstall/comp_ff_of_prereq_RHEL75.pl.base @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_ff_of_prereq_RHEL76.pl b/CommonInstall/comp_ff_of_prereq_RHEL76.pl index af44df6..49d4bd1 100644 --- a/CommonInstall/comp_ff_of_prereq_RHEL76.pl +++ b/CommonInstall/comp_ff_of_prereq_RHEL76.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_ff_of_prereq_RHEL76.pl.base b/CommonInstall/comp_ff_of_prereq_RHEL76.pl.base index af44df6..49d4bd1 100644 --- a/CommonInstall/comp_ff_of_prereq_RHEL76.pl.base +++ b/CommonInstall/comp_ff_of_prereq_RHEL76.pl.base @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_ff_of_prereq_RHEL77.pl b/CommonInstall/comp_ff_of_prereq_RHEL77.pl index af44df6..49d4bd1 100644 --- a/CommonInstall/comp_ff_of_prereq_RHEL77.pl +++ b/CommonInstall/comp_ff_of_prereq_RHEL77.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_ff_of_prereq_RHEL77.pl.base b/CommonInstall/comp_ff_of_prereq_RHEL77.pl.base index af44df6..49d4bd1 100644 --- a/CommonInstall/comp_ff_of_prereq_RHEL77.pl.base +++ b/CommonInstall/comp_ff_of_prereq_RHEL77.pl.base @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_ff_of_prereq_RHEL78.pl b/CommonInstall/comp_ff_of_prereq_RHEL78.pl new file mode 100644 index 0000000..49d4bd1 --- /dev/null +++ b/CommonInstall/comp_ff_of_prereq_RHEL78.pl @@ -0,0 +1,87 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# +# 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 --git a/CommonInstall/comp_ff_of_prereq_RHEL78.pl.base b/CommonInstall/comp_ff_of_prereq_RHEL78.pl.base new file mode 100644 index 0000000..49d4bd1 --- /dev/null +++ b/CommonInstall/comp_ff_of_prereq_RHEL78.pl.base @@ -0,0 +1,87 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# +# 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 --git a/CommonInstall/comp_ff_of_prereq_RHEL8.pl b/CommonInstall/comp_ff_of_prereq_RHEL8.pl index ee2fa78..49d4bd1 100644 --- a/CommonInstall/comp_ff_of_prereq_RHEL8.pl +++ b/CommonInstall/comp_ff_of_prereq_RHEL8.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2019, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_ff_of_prereq_RHEL8.pl.base b/CommonInstall/comp_ff_of_prereq_RHEL8.pl.base index ee2fa78..49d4bd1 100644 --- a/CommonInstall/comp_ff_of_prereq_RHEL8.pl.base +++ b/CommonInstall/comp_ff_of_prereq_RHEL8.pl.base @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2019, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_ff_of_prereq_RHEL81.pl b/CommonInstall/comp_ff_of_prereq_RHEL81.pl index ee2fa78..49d4bd1 100644 --- a/CommonInstall/comp_ff_of_prereq_RHEL81.pl +++ b/CommonInstall/comp_ff_of_prereq_RHEL81.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2019, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_ff_of_prereq_RHEL81.pl.base b/CommonInstall/comp_ff_of_prereq_RHEL81.pl.base index ee2fa78..49d4bd1 100644 --- a/CommonInstall/comp_ff_of_prereq_RHEL81.pl.base +++ b/CommonInstall/comp_ff_of_prereq_RHEL81.pl.base @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2019, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_ff_of_prereq_RHEL82.pl b/CommonInstall/comp_ff_of_prereq_RHEL82.pl new file mode 100644 index 0000000..49d4bd1 --- /dev/null +++ b/CommonInstall/comp_ff_of_prereq_RHEL82.pl @@ -0,0 +1,87 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# +# 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 --git a/CommonInstall/comp_ff_of_prereq_RHEL82.pl.base b/CommonInstall/comp_ff_of_prereq_RHEL82.pl.base new file mode 100644 index 0000000..49d4bd1 --- /dev/null +++ b/CommonInstall/comp_ff_of_prereq_RHEL82.pl.base @@ -0,0 +1,87 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# +# 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 --git a/CommonInstall/comp_ff_of_prereq_SLES122.pl b/CommonInstall/comp_ff_of_prereq_SLES122.pl index 630b16c..0b0e76d 100644 --- a/CommonInstall/comp_ff_of_prereq_SLES122.pl +++ b/CommonInstall/comp_ff_of_prereq_SLES122.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_ff_of_prereq_SLES122.pl.base b/CommonInstall/comp_ff_of_prereq_SLES122.pl.base index 630b16c..0b0e76d 100644 --- a/CommonInstall/comp_ff_of_prereq_SLES122.pl.base +++ b/CommonInstall/comp_ff_of_prereq_SLES122.pl.base @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_ff_of_prereq_SLES123.pl b/CommonInstall/comp_ff_of_prereq_SLES123.pl index 0fc926d..1c0bcf2 100644 --- a/CommonInstall/comp_ff_of_prereq_SLES123.pl +++ b/CommonInstall/comp_ff_of_prereq_SLES123.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_ff_of_prereq_SLES123.pl.base b/CommonInstall/comp_ff_of_prereq_SLES123.pl.base index 0fc926d..1c0bcf2 100644 --- a/CommonInstall/comp_ff_of_prereq_SLES123.pl.base +++ b/CommonInstall/comp_ff_of_prereq_SLES123.pl.base @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_ff_of_prereq_SLES124.pl b/CommonInstall/comp_ff_of_prereq_SLES124.pl index 0291334..1c0bcf2 100644 --- a/CommonInstall/comp_ff_of_prereq_SLES124.pl +++ b/CommonInstall/comp_ff_of_prereq_SLES124.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_ff_of_prereq_SLES124.pl.base b/CommonInstall/comp_ff_of_prereq_SLES124.pl.base index 0291334..1c0bcf2 100644 --- a/CommonInstall/comp_ff_of_prereq_SLES124.pl.base +++ b/CommonInstall/comp_ff_of_prereq_SLES124.pl.base @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_ff_of_prereq_SLES125.pl b/CommonInstall/comp_ff_of_prereq_SLES125.pl index 0291334..1c0bcf2 100644 --- a/CommonInstall/comp_ff_of_prereq_SLES125.pl +++ b/CommonInstall/comp_ff_of_prereq_SLES125.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_ff_of_prereq_SLES125.pl.base b/CommonInstall/comp_ff_of_prereq_SLES125.pl.base index 0291334..1c0bcf2 100644 --- a/CommonInstall/comp_ff_of_prereq_SLES125.pl.base +++ b/CommonInstall/comp_ff_of_prereq_SLES125.pl.base @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_ff_of_prereq_SLES15.pl b/CommonInstall/comp_ff_of_prereq_SLES15.pl index 743ac94..4eb9d8f 100644 --- a/CommonInstall/comp_ff_of_prereq_SLES15.pl +++ b/CommonInstall/comp_ff_of_prereq_SLES15.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** # -# Copyright (c) 2015-2017, Intel Corporation +# Copyright (c) 2015-2020, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/CommonInstall/comp_ff_of_prereq_SLES15.pl.base b/CommonInstall/comp_ff_of_prereq_SLES15.pl.base index 743ac94..4eb9d8f 100644 --- a/CommonInstall/comp_ff_of_prereq_SLES15.pl.base +++ b/CommonInstall/comp_ff_of_prereq_SLES15.pl.base @@ -1,7 +1,7 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** # -# Copyright (c) 2015-2017, Intel Corporation +# Copyright (c) 2015-2020, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/CommonInstall/comp_ff_of_prereq_SLES151.pl b/CommonInstall/comp_ff_of_prereq_SLES151.pl index d51d011..4eb9d8f 100644 --- a/CommonInstall/comp_ff_of_prereq_SLES151.pl +++ b/CommonInstall/comp_ff_of_prereq_SLES151.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** # -# Copyright (c) 2015-2019, Intel Corporation +# Copyright (c) 2015-2020, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/CommonInstall/comp_ff_of_prereq_SLES151.pl.base b/CommonInstall/comp_ff_of_prereq_SLES151.pl.base index d51d011..4eb9d8f 100644 --- a/CommonInstall/comp_ff_of_prereq_SLES151.pl.base +++ b/CommonInstall/comp_ff_of_prereq_SLES151.pl.base @@ -1,7 +1,7 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** # -# Copyright (c) 2015-2019, Intel Corporation +# Copyright (c) 2015-2020, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/CommonInstall/comp_ff_of_prereq_SLES152.pl b/CommonInstall/comp_ff_of_prereq_SLES152.pl new file mode 100644 index 0000000..4eb9d8f --- /dev/null +++ b/CommonInstall/comp_ff_of_prereq_SLES152.pl @@ -0,0 +1,90 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# +# 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_s1", + "libibmad5", + "libibumad3", + "libibverbs1", + "libstdc++6", + "ibacm", +); +$comp_prereq_hash{'oftools_prereq'} = \@oftools_prereq; + +my @fastfabric_prereq = ( + "glibc", + "bash", + "expect", + "perl-base", + "tcl", + "libexpat1", + "libgcc_s1", + "libibmad5", + "libibumad3", + "libibverbs1", + "libncurses6", + "libopenssl1_1", + "libstdc++6", + "libz1", + "bc", + "rdma-core", + "rdma-ndd", + "qperf", + "perftest", +); +$comp_prereq_hash{'fastfabric_prereq'} = \@fastfabric_prereq; + +my @opamgt_sdk_prereq = ( + "bash", + "glibc", + "libgcc_s1", + "libibumad3", + "libibverbs1", + "libopenssl-devel", + "libopenssl1_1", + "libstdc++6", + "openssl", + "rdma-core-devel", + "rdma-ndd", +); +$comp_prereq_hash{'opamgt_sdk_prereq'} = \@opamgt_sdk_prereq; diff --git a/CommonInstall/comp_ff_of_prereq_SLES152.pl.base b/CommonInstall/comp_ff_of_prereq_SLES152.pl.base new file mode 100644 index 0000000..4eb9d8f --- /dev/null +++ b/CommonInstall/comp_ff_of_prereq_SLES152.pl.base @@ -0,0 +1,90 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# +# 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_s1", + "libibmad5", + "libibumad3", + "libibverbs1", + "libstdc++6", + "ibacm", +); +$comp_prereq_hash{'oftools_prereq'} = \@oftools_prereq; + +my @fastfabric_prereq = ( + "glibc", + "bash", + "expect", + "perl-base", + "tcl", + "libexpat1", + "libgcc_s1", + "libibmad5", + "libibumad3", + "libibverbs1", + "libncurses6", + "libopenssl1_1", + "libstdc++6", + "libz1", + "bc", + "rdma-core", + "rdma-ndd", + "qperf", + "perftest", +); +$comp_prereq_hash{'fastfabric_prereq'} = \@fastfabric_prereq; + +my @opamgt_sdk_prereq = ( + "bash", + "glibc", + "libgcc_s1", + "libibumad3", + "libibverbs1", + "libopenssl-devel", + "libopenssl1_1", + "libstdc++6", + "openssl", + "rdma-core-devel", + "rdma-ndd", +); +$comp_prereq_hash{'opamgt_sdk_prereq'} = \@opamgt_sdk_prereq; diff --git a/CommonInstall/comp_fm_prereq_RHEL72.pl b/CommonInstall/comp_fm_prereq_RHEL72.pl index 4a10b94..add8bfb 100644 --- a/CommonInstall/comp_fm_prereq_RHEL72.pl +++ b/CommonInstall/comp_fm_prereq_RHEL72.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_fm_prereq_RHEL72.pl.base b/CommonInstall/comp_fm_prereq_RHEL72.pl.base index 4a10b94..add8bfb 100644 --- a/CommonInstall/comp_fm_prereq_RHEL72.pl.base +++ b/CommonInstall/comp_fm_prereq_RHEL72.pl.base @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_fm_prereq_RHEL73.pl b/CommonInstall/comp_fm_prereq_RHEL73.pl index 7566eaa..fb94df1 100644 --- a/CommonInstall/comp_fm_prereq_RHEL73.pl +++ b/CommonInstall/comp_fm_prereq_RHEL73.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_fm_prereq_RHEL73.pl.base b/CommonInstall/comp_fm_prereq_RHEL73.pl.base index 7566eaa..fb94df1 100644 --- a/CommonInstall/comp_fm_prereq_RHEL73.pl.base +++ b/CommonInstall/comp_fm_prereq_RHEL73.pl.base @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_fm_prereq_RHEL74.pl b/CommonInstall/comp_fm_prereq_RHEL74.pl index 3c9d252..6365019 100644 --- a/CommonInstall/comp_fm_prereq_RHEL74.pl +++ b/CommonInstall/comp_fm_prereq_RHEL74.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_fm_prereq_RHEL74.pl.base b/CommonInstall/comp_fm_prereq_RHEL74.pl.base index 3c9d252..6365019 100644 --- a/CommonInstall/comp_fm_prereq_RHEL74.pl.base +++ b/CommonInstall/comp_fm_prereq_RHEL74.pl.base @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_fm_prereq_RHEL75.pl b/CommonInstall/comp_fm_prereq_RHEL75.pl index 28a9377..bb83477 100644 --- a/CommonInstall/comp_fm_prereq_RHEL75.pl +++ b/CommonInstall/comp_fm_prereq_RHEL75.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_fm_prereq_RHEL75.pl.base b/CommonInstall/comp_fm_prereq_RHEL75.pl.base index 28a9377..bb83477 100644 --- a/CommonInstall/comp_fm_prereq_RHEL75.pl.base +++ b/CommonInstall/comp_fm_prereq_RHEL75.pl.base @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_fm_prereq_RHEL76.pl b/CommonInstall/comp_fm_prereq_RHEL76.pl index a166489..bb83477 100644 --- a/CommonInstall/comp_fm_prereq_RHEL76.pl +++ b/CommonInstall/comp_fm_prereq_RHEL76.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_fm_prereq_RHEL76.pl.base b/CommonInstall/comp_fm_prereq_RHEL76.pl.base index a166489..bb83477 100644 --- a/CommonInstall/comp_fm_prereq_RHEL76.pl.base +++ b/CommonInstall/comp_fm_prereq_RHEL76.pl.base @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_fm_prereq_RHEL77.pl b/CommonInstall/comp_fm_prereq_RHEL77.pl index a166489..bb83477 100644 --- a/CommonInstall/comp_fm_prereq_RHEL77.pl +++ b/CommonInstall/comp_fm_prereq_RHEL77.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_fm_prereq_RHEL77.pl.base b/CommonInstall/comp_fm_prereq_RHEL77.pl.base index a166489..bb83477 100644 --- a/CommonInstall/comp_fm_prereq_RHEL77.pl.base +++ b/CommonInstall/comp_fm_prereq_RHEL77.pl.base @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_fm_prereq_RHEL78.pl b/CommonInstall/comp_fm_prereq_RHEL78.pl new file mode 100644 index 0000000..bb83477 --- /dev/null +++ b/CommonInstall/comp_fm_prereq_RHEL78.pl @@ -0,0 +1,53 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# +# 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 --git a/CommonInstall/comp_fm_prereq_RHEL78.pl.base b/CommonInstall/comp_fm_prereq_RHEL78.pl.base new file mode 100644 index 0000000..bb83477 --- /dev/null +++ b/CommonInstall/comp_fm_prereq_RHEL78.pl.base @@ -0,0 +1,53 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# +# 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 --git a/CommonInstall/comp_fm_prereq_RHEL8.pl b/CommonInstall/comp_fm_prereq_RHEL8.pl index c16ef21..21bbb78 100644 --- a/CommonInstall/comp_fm_prereq_RHEL8.pl +++ b/CommonInstall/comp_fm_prereq_RHEL8.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2019, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_fm_prereq_RHEL8.pl.base b/CommonInstall/comp_fm_prereq_RHEL8.pl.base index c16ef21..21bbb78 100644 --- a/CommonInstall/comp_fm_prereq_RHEL8.pl.base +++ b/CommonInstall/comp_fm_prereq_RHEL8.pl.base @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2019, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_fm_prereq_RHEL81.pl b/CommonInstall/comp_fm_prereq_RHEL81.pl index c16ef21..21bbb78 100644 --- a/CommonInstall/comp_fm_prereq_RHEL81.pl +++ b/CommonInstall/comp_fm_prereq_RHEL81.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2019, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_fm_prereq_RHEL81.pl.base b/CommonInstall/comp_fm_prereq_RHEL81.pl.base index c16ef21..21bbb78 100644 --- a/CommonInstall/comp_fm_prereq_RHEL81.pl.base +++ b/CommonInstall/comp_fm_prereq_RHEL81.pl.base @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2019, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_fm_prereq_RHEL82.pl b/CommonInstall/comp_fm_prereq_RHEL82.pl new file mode 100644 index 0000000..21bbb78 --- /dev/null +++ b/CommonInstall/comp_fm_prereq_RHEL82.pl @@ -0,0 +1,52 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# +# 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 --git a/CommonInstall/comp_fm_prereq_RHEL82.pl.base b/CommonInstall/comp_fm_prereq_RHEL82.pl.base new file mode 100644 index 0000000..21bbb78 --- /dev/null +++ b/CommonInstall/comp_fm_prereq_RHEL82.pl.base @@ -0,0 +1,52 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# +# 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 --git a/CommonInstall/comp_fm_prereq_SLES122.pl b/CommonInstall/comp_fm_prereq_SLES122.pl index 819b374..f183d29 100644 --- a/CommonInstall/comp_fm_prereq_SLES122.pl +++ b/CommonInstall/comp_fm_prereq_SLES122.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_fm_prereq_SLES122.pl.base b/CommonInstall/comp_fm_prereq_SLES122.pl.base index 819b374..f183d29 100644 --- a/CommonInstall/comp_fm_prereq_SLES122.pl.base +++ b/CommonInstall/comp_fm_prereq_SLES122.pl.base @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_fm_prereq_SLES123.pl b/CommonInstall/comp_fm_prereq_SLES123.pl index 06aa0d4..81d6ef7 100644 --- a/CommonInstall/comp_fm_prereq_SLES123.pl +++ b/CommonInstall/comp_fm_prereq_SLES123.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_fm_prereq_SLES123.pl.base b/CommonInstall/comp_fm_prereq_SLES123.pl.base index 06aa0d4..81d6ef7 100644 --- a/CommonInstall/comp_fm_prereq_SLES123.pl.base +++ b/CommonInstall/comp_fm_prereq_SLES123.pl.base @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_fm_prereq_SLES124.pl b/CommonInstall/comp_fm_prereq_SLES124.pl index aa0845d..81d6ef7 100644 --- a/CommonInstall/comp_fm_prereq_SLES124.pl +++ b/CommonInstall/comp_fm_prereq_SLES124.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_fm_prereq_SLES124.pl.base b/CommonInstall/comp_fm_prereq_SLES124.pl.base index aa0845d..81d6ef7 100644 --- a/CommonInstall/comp_fm_prereq_SLES124.pl.base +++ b/CommonInstall/comp_fm_prereq_SLES124.pl.base @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_fm_prereq_SLES125.pl b/CommonInstall/comp_fm_prereq_SLES125.pl index aa0845d..81d6ef7 100644 --- a/CommonInstall/comp_fm_prereq_SLES125.pl +++ b/CommonInstall/comp_fm_prereq_SLES125.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_fm_prereq_SLES125.pl.base b/CommonInstall/comp_fm_prereq_SLES125.pl.base index aa0845d..81d6ef7 100644 --- a/CommonInstall/comp_fm_prereq_SLES125.pl.base +++ b/CommonInstall/comp_fm_prereq_SLES125.pl.base @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_fm_prereq_SLES15.pl b/CommonInstall/comp_fm_prereq_SLES15.pl index f4dac89..4987d7f 100644 --- a/CommonInstall/comp_fm_prereq_SLES15.pl +++ b/CommonInstall/comp_fm_prereq_SLES15.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** # -# Copyright (c) 2015-2017, Intel Corporation +# Copyright (c) 2015-2020, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/CommonInstall/comp_fm_prereq_SLES15.pl.base b/CommonInstall/comp_fm_prereq_SLES15.pl.base index f4dac89..4987d7f 100644 --- a/CommonInstall/comp_fm_prereq_SLES15.pl.base +++ b/CommonInstall/comp_fm_prereq_SLES15.pl.base @@ -1,7 +1,7 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** # -# Copyright (c) 2015-2017, Intel Corporation +# Copyright (c) 2015-2020, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/CommonInstall/comp_fm_prereq_SLES151.pl b/CommonInstall/comp_fm_prereq_SLES151.pl index 289eddb..4987d7f 100644 --- a/CommonInstall/comp_fm_prereq_SLES151.pl +++ b/CommonInstall/comp_fm_prereq_SLES151.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** # -# Copyright (c) 2015-2019, Intel Corporation +# Copyright (c) 2015-2020, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/CommonInstall/comp_fm_prereq_SLES151.pl.base b/CommonInstall/comp_fm_prereq_SLES151.pl.base index 289eddb..4987d7f 100644 --- a/CommonInstall/comp_fm_prereq_SLES151.pl.base +++ b/CommonInstall/comp_fm_prereq_SLES151.pl.base @@ -1,7 +1,7 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** # -# Copyright (c) 2015-2019, Intel Corporation +# Copyright (c) 2015-2020, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/CommonInstall/comp_fm_prereq_SLES152.pl b/CommonInstall/comp_fm_prereq_SLES152.pl new file mode 100644 index 0000000..4987d7f --- /dev/null +++ b/CommonInstall/comp_fm_prereq_SLES152.pl @@ -0,0 +1,54 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# +# 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 = ( + "glibc", + "bash", + "rdma-core", + "rdma-ndd", + "systemd", + "libexpat1", + "libibmad5", + "libibumad3", + "libibverbs1", + "libopenssl1_1", + "libz1", +); +$comp_prereq_hash{'opafm_prereq'} = \@opafm_prereq; diff --git a/CommonInstall/comp_fm_prereq_SLES152.pl.base b/CommonInstall/comp_fm_prereq_SLES152.pl.base new file mode 100644 index 0000000..4987d7f --- /dev/null +++ b/CommonInstall/comp_fm_prereq_SLES152.pl.base @@ -0,0 +1,54 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# +# 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 = ( + "glibc", + "bash", + "rdma-core", + "rdma-ndd", + "systemd", + "libexpat1", + "libibmad5", + "libibumad3", + "libibverbs1", + "libopenssl1_1", + "libz1", +); +$comp_prereq_hash{'opafm_prereq'} = \@opafm_prereq; diff --git a/CommonInstall/comp_oftools.pl b/CommonInstall/comp_oftools.pl index 5cb5f59..d6b6d65 100755 --- a/CommonInstall/comp_oftools.pl +++ b/CommonInstall/comp_oftools.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/comp_omnipath.pl b/CommonInstall/comp_omnipath.pl index 3f137c3..1a0da72 100644 --- a/CommonInstall/comp_omnipath.pl +++ b/CommonInstall/comp_omnipath.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] @@ -1193,7 +1193,7 @@ sub available_mpisrc() sub installed_mpisrc() { - my $srcdir = "/usr/src/opa/MPI"; + my $srcdir = $ExtraMpisrcInfo{'Dest'}; my $old_srcdir = "/usr/lib/opa/src/MPI"; return (has_mpisrc($srcdir) || has_mpisrc($old_srcdir)); } @@ -1201,15 +1201,18 @@ sub installed_mpisrc() sub has_mpisrc($) { my $srcdir = shift(); - return (file_glob("$srcdir/mvapich*.src.rpm") ne "" - && file_glob("$srcdir/openmpi*.src.rpm") ne "" - && file_glob("$srcdir/mpitests*.src.rpm") ne ""); + foreach my $srpm (@{$ExtraMpisrcInfo{'SrcRpms'}}) { + if (file_glob("$srcdir/${srpm}*.src.rpm") eq "") { + return 0; + } + } + return 1; } # only called if installed_mpisrc is true sub installed_version_mpisrc() { - return `cat /usr/src/opa/MPI/.version`; + return `cat $ExtraMpisrcInfo{'Dest'}/.version`; } # only called if available_mpisrc is true @@ -1255,36 +1258,41 @@ sub install_mpisrc($$) my $installing_list = shift(); # what items are being installed/reinstalled my $srcdir=$ComponentInfo{'mpisrc'}{'SrcDir'}; - my $version = media_version_mpisrc(); - chomp $version; + my $version = media_version_mpisrc(); + chomp $version; - printf ("Installing $ComponentInfo{'mpisrc'}{'Name'} $version...\n"); - LogPrint ("Installing $ComponentInfo{'mpisrc'}{'Name'} $version for $CUR_OS_VER\n"); + printf ("Installing $ComponentInfo{'mpisrc'}{'Name'} $version...\n"); + LogPrint ("Installing $ComponentInfo{'mpisrc'}{'Name'} $version for $CUR_OS_VER\n"); - check_dir("/usr/src/opa"); - check_dir("/usr/src/opa/MPI"); + my $destdir = $ExtraMpisrcInfo{'Dest'}; + check_dir($destdir); # remove old versions (.src.rpm and built .rpm files too) - system "rm -rf /usr/src/opa/MPI/mvapich[-_]*.rpm 2>/dev/null"; - system "rm -rf /usr/src/opa/MPI/mvapich2[-_]*.rpm 2>/dev/null"; - system "rm -rf /usr/src/opa/MPI/openmpi[-_]*.rpm 2>/dev/null"; - system "rm -rf /usr/src/opa/MPI/mpitests[-_]*.rpm 2>/dev/null"; - system "rm -rf /usr/src/opa/MPI/make.*.res 2>/dev/null"; - system "rm -rf /usr/src/opa/MPI/make.*.err 2>/dev/null"; - system "rm -rf /usr/src/opa/MPI/make.*.warn 2>/dev/null"; - system "rm -rf /usr/src/opa/MPI/.mpiinfo 2>/dev/null"; + system "rm -f $destdir/mvapich[-_]*.rpm 2>/dev/null"; + foreach my $srpm (@{$ExtraMpisrcInfo{'SrcRpms'}}) + { + system "rm -f $destdir/$srpm-*.rpm 2>/dev/null"; + } + foreach my $file (@{$ExtraMpisrcInfo{'DirtyFiles'}}) + { + system "rm -f $destdir/$file 2>/dev/null"; + } # install new versions - foreach my $srpm ( "mvapich2", "openmpi", "mpitests" ) { + foreach my $srpm (@{$ExtraMpisrcInfo{'SrcRpms'}}) { my $srpmfile = file_glob("$srcdir/${srpm}-*.src.rpm"); if ( "$srpmfile" ne "" ) { my $file = my_basename($srpmfile); - copy_data_file($srpmfile, "/usr/src/opa/MPI/$file"); + copy_data_file($srpmfile, "$destdir/$file"); } } - copy_systool_file("$srcdir/do_build", "/usr/src/opa/MPI/do_build"); - copy_systool_file("$srcdir/do_mvapich2_build", "/usr/src/opa/MPI/do_mvapich2_build"); - copy_systool_file("$srcdir/do_openmpi_build", "/usr/src/opa/MPI/do_openmpi_build"); - copy_data_file("$srcdir/version", "/usr/src/opa/MPI/.version"); + foreach my $script (@{$ExtraMpisrcInfo{'BuildScripts'}}) { + copy_systool_file("$srcdir/$script", "$destdir/$script"); + } + foreach my $file (@{$ExtraMpisrcInfo{'MiscFiles'}}) { + my $src = ${$file}{'Src'}; + my $dest = ${$file}{'Dest'}; + copy_data_file("$srcdir/$src", "$destdir/$dest"); + } $ComponentWasInstalled{'mpisrc'}=1; } @@ -1307,21 +1315,23 @@ sub uninstall_mpisrc($$) rpm_is_installed("opameta_mpisrc_userspace", "any")) { rpm_uninstall_matches("opameta_mpisrc", "opameta_mpisrc", "", ""); } else { + my $destdir = $ExtraMpisrcInfo{'Dest'}; # remove old versions (.src.rpm and built .rpm files too) - system "rm -rf /usr/src/opa/MPI/.version 2>/dev/null"; - system "rm -rf /usr/src/opa/MPI/mvapich2[-_]*.rpm 2>/dev/null"; - system "rm -rf /usr/src/opa/MPI/openmpi[-_]*.rpm 2>/dev/null"; - system "rm -rf /usr/src/opa/MPI/mpitests[-_]*.rpm 2>/dev/null"; - system "rm -rf /usr/src/opa/MPI/make.*.res 2>/dev/null"; - system "rm -rf /usr/src/opa/MPI/make.*.err 2>/dev/null"; - system "rm -rf /usr/src/opa/MPI/make.*.warn 2>/dev/null"; - system "rm -rf /usr/src/opa/MPI/.mpiinfo 2>/dev/null"; - system "rm -rf /usr/src/opa/MPI/do_build 2>/dev/null"; - system "rm -rf /usr/src/opa/MPI/do_mvapich2_build 2>/dev/null"; - system "rm -rf /usr/src/opa/MPI/do_openmpi_build 2>/dev/null"; - system "rm -rf /usr/src/opa/MPI/.mpiinfo 2>/dev/null"; - - system "rmdir /usr/src/opa/MPI 2>/dev/null"; # remove only if empty + foreach my $srpm (@{$ExtraMpisrcInfo{'SrcRpms'}}) { + system "rm -f $destdir/$srpm-*.rpm 2>/dev/null"; + } + foreach my $script (@{$ExtraMpisrcInfo{'BuildScripts'}}) { + system "rm -f $destdir/$script 2>/dev/null"; + } + foreach my $file (@{$ExtraMpisrcInfo{'MiscFiles'}}) { + my $destfile = ${$file}{'Dest'}; + system "rm -f $destdir/$destfile 2>/dev/null"; + } + foreach my $file (@{$ExtraMpisrcInfo{'DirtyFiles'}}) { + system "rm -f $destdir/$file 2>/dev/null"; + } + + system "rmdir $destdir 2>/dev/null"; # remove only if empty system "rmdir /usr/src/opa 2>/dev/null"; # remove only if empty } diff --git a/CommonInstall/comp_qlgc_fm.pl b/CommonInstall/comp_qlgc_fm.pl index c7473ab..c4d06c9 100755 --- a/CommonInstall/comp_qlgc_fm.pl +++ b/CommonInstall/comp_qlgc_fm.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/do_build.sh b/CommonInstall/do_build.sh index 548c2a2..84568e6 100755 --- a/CommonInstall/do_build.sh +++ b/CommonInstall/do_build.sh @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/do_mvapich2_build.sh b/CommonInstall/do_mvapich2_build.sh index 4cc34b1..58cd8ee 100755 --- a/CommonInstall/do_mvapich2_build.sh +++ b/CommonInstall/do_mvapich2_build.sh @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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 **************************************** # This file incorporates work covered by the following copyright and permission notice @@ -65,6 +65,9 @@ VERSION_ID="" if [ -e /etc/os-release ]; then . /etc/os-release + if [[ "$ID" == "sle_hpc" ]]; then + ID="sles" + fi else echo /etc/os-release is not available !!! fi diff --git a/CommonInstall/do_openmpi_build.sh b/CommonInstall/do_openmpi_build.sh index fad9e14..e6e16b4 100755 --- a/CommonInstall/do_openmpi_build.sh +++ b/CommonInstall/do_openmpi_build.sh @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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 **************************************** # This file incorporates work covered by the following copyright and permission notice @@ -65,16 +65,14 @@ VERSION_ID="" if [ -e /etc/os-release ]; then . /etc/os-release + if [[ "$ID" == "sle_hpc" ]]; then + ID="sles" + fi else echo /etc/os-release is not available !!! fi -if [[ ( "$ID" == "rhel" && $(echo "$VERSION_ID > 7.3" | bc -l) == 1 ) || \ - ( "$ID" == "sles" && $(echo "$VERSION_ID > 12.2" | bc -l) == 1 ) ]]; then - PREREQ=("rdma-core-devel" "mpi-selector") -else - PREREQ=("libibverbs-devel" "librdmacm-devel" "mpi-selector") -fi +PREREQ=( "mpi-selector" ) CheckPreReqs() { @@ -137,27 +135,11 @@ Usage() unset MAKEFLAGS -ARCH=$(uname -m | sed -e s/ppc/PPC/ -e s/powerpc/PPC/ -e s/i.86/IA32/ -e s/ia64/IA64/ -e s/x86_64/X86_64/) +# Convert the architecture to all-caps to simplify comparisons. +ARCH=$(uname -m | tr "[:lower:]" "[:upper:]") target_cpu=$(rpm --eval '%{_target_cpu}') dist_rpm_rel_int=0 -if [ "$ARCH" = "PPC64" -a -f /etc/issue -a -f /etc/SuSE-release ] -then - # needed to test for SLES 10 SP1 on PPC64 below - dist_rpm_rel=$(rpm --queryformat "[%{RELEASE}]\n" -q $(rpm -qf /etc/issue)|uniq) - dist_rpm_rel_major="$(echo $dist_rpm_rel|cut -f1 -d.)" - dist_rpm_rel_minor="$(echo $dist_rpm_rel|cut -f2 -d.)" - # convert version to a 4 digit integer - if [ $dist_rpm_rel_major -lt 10 ] - then - dist_rpm_rel_major="0$dist_rpm_rel_major"; - fi - if [ $dist_rpm_rel_minor -lt 10 ] - then - dist_rpm_rel_minor="0$dist_rpm_rel_minor"; - fi - dist_rpm_rel_int="$dist_rpm_rel_major$dist_rpm_rel_minor" -fi nocomp() { @@ -198,15 +180,13 @@ iflag=n # undocumented option, build in context of install Qflag=n Oflag=n Cflag=n -Vflag=n # undocumented option, build verbs only transport -while getopts "idQOCV" o +while getopts "idQOC" o do case "$o" in i) iflag=y;; Q) Qflag=y;; O) Oflag=y;; C) Cflag=y;; - V) Vflag=y;; d) skip_prompt=y;; *) Usage;; esac @@ -217,12 +197,6 @@ then Usage fi -if [[ "$Vflag" == "y" && \ - ( "$Qflag" == "y" || "$Oflag" == "y" || "$Cflag" == "y" ) ]]; then - echo "ERROR: Option -V cannot be used with any other" >&2 - exit 1 -fi - if [ "$(/usr/bin/id -u)" != 0 ] then echo "ERROR: You must be 'root' to run this program" >&2 @@ -291,117 +265,94 @@ then fi # now get openmpi options. -if [ "$Vflag" != y ] +if [ "$skip_prompt" != y -a "$Qflag" != y ] then - if [ "$skip_prompt" != y -a "$Qflag" != y ] + if rpm -qa|grep infinipath-psm-devel >/dev/null 2>&1 then - if rpm -qa|grep infinipath-psm-devel >/dev/null 2>&1 + echo + get_yes_no "Build for True Scale HCA PSM" "y" + if [ "$ans" = 1 ] then - echo - get_yes_no "Build for True Scale HCA PSM" "y" - if [ "$ans" = 1 ] - then - Qflag=y - fi + Qflag=y fi fi +fi - if [ "$skip_prompt" != y -a "$Oflag" != y ] +if [ "$skip_prompt" != y -a "$Oflag" != y ] +then + if rpm -qa|grep libpsm2-devel >/dev/null 2>&1 && + rpm -qa|grep libfabric-devel >/dev/null 2>&1 then - if rpm -qa|grep libpsm2-devel >/dev/null 2>&1 && - rpm -qa|grep libfabric-devel >/dev/null 2>&1 + echo + get_yes_no "Build for Omnipath HFI PSM2 and OFI" "y" + if [ "$ans" = 1 ] then - echo - get_yes_no "Build for Omnipath HFI PSM2 and OFI" "y" - if [ "$ans" = 1 ] - then - Oflag=y - fi + Oflag=y fi fi +fi - if [ "$skip_prompt" != y -a "$Cflag" != y ] +if [ "$skip_prompt" != y -a "$Cflag" != y ] +then + if rpm -qa|grep libpsm2-devel >/dev/null 2>&1 && + rpm -qa|grep cuda-cudart-dev >/dev/null 2>&1 then - if rpm -qa|grep libpsm2-devel >/dev/null 2>&1 && - rpm -qa|grep cuda-cudart-dev >/dev/null 2>&1 + echo + get_yes_no "Build for Omnipath HFI PSM2 with Cuda" "y" + if [ "$ans" = 1 ] then - echo - get_yes_no "Build for Omnipath HFI PSM2 with Cuda" "y" - if [ "$ans" = 1 ] - then - Cflag=y - fi + Cflag=y fi - fi + fi fi # if -d (skip_prompt) the only option provided, ./configure will run with # no paramters and build what is auto-detected openmpi_conf_psm='' -if [ "$Vflag" = y ] +# we no longer supports verbs. +openmpi_verbs='--enable-mca-no-build=btl-openib --without-verbs' + +if [ "$Qflag" = y ] then - # The openmpi configure script complains about enable-mca-no-build - # not being a supported option, but then actually executes it correctly. - #openmpi_conf_psm='--enable-mca-no-build=mtl-psm' - openmpi_conf_psm='--with-psm=no --with-psm2=no --with-libfabric=no --enable-mca-no-build=mtl-psm ' - openmpi_path_suffix= - openmpi_rpm_suffix= - interface=verbs -else - if [ "$Qflag" = y ] - then - PREREQ+=('infinipath-psm-devel') - openmpi_conf_psm='--with-psm=/usr ' - # PSM indicated by qlc suffix so user can ID PSM vs verbs or PSM2 MPIs - openmpi_path_suffix="-qlc" - openmpi_rpm_suffix="_qlc" - interface=psm - fi + PREREQ+=('infinipath-psm-devel') + openmpi_conf_psm='--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" + interface=psm +fi - if [ "$Oflag" = y ] - then - PREREQ+=('libpsm2-devel' 'libfabric-devel') - openmpi_conf_psm=" $openmpi_conf_psm --with-psm2=/usr --with-libfabric=/usr " - # PSM2 indicated by hfi suffix so user can ID from PSM or verbs MPIs - openmpi_path_suffix="-hfi" - openmpi_rpm_suffix="_hfi" - interface=psm - fi +if [ "$Oflag" = y ] +then + PREREQ+=('libpsm2-devel' 'libfabric-devel') + openmpi_conf_psm=" $openmpi_conf_psm --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" + interface=psm +fi - if [ "$Cflag" = y ] - then - PREREQ+=('libpsm2-devel' 'cuda-cudart-dev') - openmpi_conf_psm=" $openmpi_conf_psm --with-psm2=/usr --with-cuda=/usr/local/cuda " - # CUDA indicated by -cuda suffix so user can ID from PSM2 without cuda, PSM or verbs MPIs - openmpi_path_suffix="-cuda-hfi" - openmpi_rpm_suffix="_cuda_hfi" - interface=psm - fi +if [ "$Cflag" = y ] +then + PREREQ+=('libpsm2-devel' 'cuda-cudart-dev') + openmpi_conf_psm=" $openmpi_conf_psm --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" + interface=psm fi CheckPreReqs -if [ "$ARCH" = "PPC64" -a \ - \( ! -f /etc/SuSE-release -o "$dist_rpm_rel_int" -le "1502" \) ] # eg. 15.2 -then - export LDFLAGS="-m64 -g -O2 -L/usr/lib64 -L/usr/X11R6/lib64" - export CFLAGS="-m64 -g -O2" - export CPPFLAGS="-m64 -g -O2" - export CXXFLAGS="-m64 -g -O2" - export FFLAGS="-m64 -g -O2" - export F90FLAGS="-m64 -g -O2" - export LDLIBS="-m64 -g -O2 -L/usr/lib64 -L/usr/X11R6/lib64" -else - # just to be safe - unset LDFLAGS - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset FFLAGS - unset F90FLAGS - unset LDLIBS -fi +# just to be safe +unset LDFLAGS +unset CFLAGS +unset CPPFLAGS +unset CXXFLAGS +unset FFLAGS +unset F90FLAGS +unset LDLIBS logfile=make.openmpi.$interface.$compiler ( @@ -469,7 +420,7 @@ logfile=make.openmpi.$interface.$compiler echo "Building OpenMPI MPI $openmpi_version Library/Tools..." mkdir -p $BUILD_ROOT $RPM_DIR/BUILD $RPM_DIR/RPMS $RPM_DIR/SOURCES $RPM_DIR/SPECS $RPM_DIR/SRPMS - if [ "$ARCH" = "PPC64" -o "$ARCH" = "X86_64" ] + if [ "$ARCH" = "X86_64" ] then openmpi_lib="lib64" else @@ -482,18 +433,12 @@ logfile=make.openmpi.$interface.$compiler openmpi_wrapper_cxx_flags="" # need to create proper openmpi_comp_env value for OpenMPI builds - if [ "$ARCH" = "PPC64" -a \ - \( -f /etc/SuSE-release -a "$dist_rpm_rel_int" -gt "1502" \) ] # eg. 15.2 - then - openmpi_comp_env='LDFLAGS="-m64 -O2 -L/usr/lib/gcc/powerpc64-suse-linux/4.1.2/64"' - else - openmpi_comp_env="" - fi + openmpi_comp_env="" case "$compiler" in gcc) if [[ ( "$ID" == "rhel" && $(echo "$VERSION_ID >= 8.0" | bc -l) == 1 ) ]]; then - openmpi_comp_env="$openmpi_comp_env CC=gcc CFLAGS="-O3 -fPIC"" + openmpi_comp_env="$openmpi_comp_env CC=gcc CFLAGS=\"-O3 -fPIC\"" else openmpi_comp_env="$openmpi_comp_env CC=gcc CFLAGS=-O3" fi @@ -581,21 +526,6 @@ logfile=make.openmpi.$interface.$compiler exit 1;; esac - if [ "$ARCH" = "PPC64" ] - then - openmpi_comp_env="$openmpi_comp_env --disable-mpi-f77 --disable-mpi-f90" - # In the ppc64 case, add -m64 to all the relevant - # flags because it's not the default. Also - # unconditionally add $OMPI_RPATH because even if - # it's blank, it's ok because there are other - # options added into the ldflags so the overall - # string won't be blank. - openmpi_comp_env="$openmpi_comp_env CFLAGS=\"-m64 -O2\" CXXFLAGS=\"-m64 -O2\" FCFLAGS=\"-m64 -O2\" FFLAGS=\"-m64 -O2\"" - openmpi_comp_env="$openmpi_comp_env --with-wrapper-ldflags=\"-g -O2 -m64 -L/usr/lib64\" --with-wrapper-cflags=-m64" - openmpi_comp_env="$openmpi_comp_env --with-wrapper-cxxflags=-m64 --with-wrapper-fflags=-m64 --with-wrapper-fcflags=-m64" - openmpi_wrapper_cxx_flags="$openmpi_wrapper_cxx_flags -m64"; - fi - openmpi_comp_env="$openmpi_comp_env --enable-mpirun-prefix-by-default" if [ x"$openmpi_wrapper_cxx_flags" != x ] then @@ -635,7 +565,7 @@ logfile=make.openmpi.$interface.$compiler --define '_defaultdocdir $MPICH_PREFIX/doc/..' \ --define '_mandir %{_prefix}/share/man' \ --define 'mflags -j 4' \ - --define 'configure_options $CONFIG_OPTIONS $openmpi_ldflags --with-verbs=$STACK_PREFIX --with-verbs-libdir=$STACK_PREFIX/$openmpi_lib $openmpi_comp_env $openmpi_conf_psm --with-devel-headers --disable-oshmem' \ + --define 'configure_options $CONFIG_OPTIONS $openmpi_ldflags $openmpi_comp_env $openmpi_conf_psm --with-devel-headers --disable-oshmem $openmpi_verbs' \ --define 'use_default_rpm_opt_flags $use_default_rpm_opt_flags' \ $disable_auto_requires" cmd="$cmd \ @@ -732,7 +662,7 @@ egrep 'warning:' $logfile.res |sort -u | #egrep 'error:|Error | Stop' $logfile.res| sort -u | # egrep -v 'error: this file was generated for autoconf 2.61.' > $logfile.err egrep 'error:|Error | Stop' $logfile.res| sort -u | - egrep -v 'configure: error: no BPatch.h found; check path for Dyninst package|configure: error: no vtf3.h found; check path for VTF3 package|configure: error: MPI Correctness Checking support cannot be built inside Open MPI|configure: error: no bmi.h found; check path for BMI package first...|configure: error: no ctool/ctool.h found; check path for CTool package first...|configure: error: no cuda.h found; check path for CUDA Toolkit first...|configure: error: no cuda_runtime_api.h found; check path for CUDA Toolkit first...|configure: error: no cupti.h found; check path for CUPTI package first...|configure: error: no f2c.h found; check path for CLAPACK package first...|configure: error: no jvmti.h found; check path for JVMTI package first...|configure: error: no libcpc.h found; check path for CPC package first...|configure: error: no tau_instrumentor found; check path for PDToolkit first...|configure: error: no unimci-config found; check path for UniMCI package first...|"Error code:|"Unknown error:|strerror_r|configure: error: CUPTI API version could not be determined...|asprintf(&msg, "Unexpected sendto() error: errno=%d (%s)",' > $logfile.err + egrep -v 'configure: error: no BPatch.h found; check path for Dyninst package|configure: error: no vtf3.h found; check path for VTF3 package|configure: error: MPI Correctness Checking support cannot be built inside Open MPI|configure: error: no bmi.h found; check path for BMI package first...|configure: error: no ctool/ctool.h found; check path for CTool package first...|configure: error: no cuda.h found; check path for CUDA Toolkit first...|configure: error: no cuda_runtime_api.h found; check path for CUDA Toolkit first...|configure: error: no cupti.h found; check path for CUPTI package first...|configure: error: no f2c.h found; check path for CLAPACK package first...|configure: error: no jvmti.h found; check path for JVMTI package first...|configure: error: no libcpc.h found; check path for CPC package first...|configure: error: no tau_instrumentor found; check path for PDToolkit first...|configure: error: no unimci-config found; check path for UniMCI package first...|"Error code:|"Unknown error:|strerror_r|configure: error: CUPTI API version could not be determined...|asprintf\(&msg, "Unexpected sendto\(\) error: errno=%d \(%s\)",' > $logfile.err if [ -s $logfile.err ] then diff --git a/CommonInstall/main_omnipathwrap_delta.pl b/CommonInstall/main_omnipathwrap_delta.pl index 90f93a0..421ab11 100644 --- a/CommonInstall/main_omnipathwrap_delta.pl +++ b/CommonInstall/main_omnipathwrap_delta.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # BEGIN_ICS_COPYRIGHT8 **************************************** # -# Copyright (c) 2015-2017, Intel Corporation +# Copyright (c) 2015-2020, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: @@ -44,6 +44,7 @@ my $Build_Debug=0; # should we provide more info for debug my $Build_Temp=""; # temp area to use for build my $Default_Build = 0; # -B option used to select build my $Build_Force = 0;# rebuild option used to force full rebuild +my $To_Show_Comps = 0; # indicate whether we need to show components or not $FirstIPoIBInterface=0; # first device is ib0 @@ -76,6 +77,8 @@ my @Components_sles15 = ( "opa_stack", @OmniPathAllComponents ); my @Components_sles15_sp1 = ( "opa_stack", @OmniPathAllComponents ); +my @Components_sles15_sp2 = ( "opa_stack", + @OmniPathAllComponents ); my @Components_rhel74 = ( "opa_stack", "mpi_selector", @OmniPathAllComponents ); my @Components_rhel75 = ( "opa_stack", "mpi_selector", @@ -84,10 +87,14 @@ my @Components_rhel76 = ( "opa_stack", "mpi_selector", @OmniPathAllComponents ); my @Components_rhel77 = ( "opa_stack", "mpi_selector", @OmniPathAllComponents ); +my @Components_rhel78 = ( "opa_stack", "mpi_selector", + @OmniPathAllComponents ); my @Components_rhel8 = ( "opa_stack", "mpi_selector", @OmniPathAllComponents ); my @Components_rhel81 = ( "opa_stack", "mpi_selector", @OmniPathAllComponents ); +my @Components_rhel82 = ( "opa_stack", "mpi_selector", + @OmniPathAllComponents ); @Components = ( ); @@ -292,7 +299,7 @@ $WrapperComponent = "opaconfig"; DefaultInstall => $State_Install, SrcDir => file_glob ("./OFA_MPIS.*"), PreReq => " opa_stack intel_hfi mpi_selector ", CoReq => "", - Hidden => 0, Disabled => 0, IsOFA => 0, + Hidden => 1, Disabled => 1, IsOFA => 0, KernelRpms => [ ], FirmwareRpms => [ ], UserRpms => [ "openmpi_gcc_cuda_hfi", "mpitests_openmpi_gcc_cuda_hfi" ], @@ -501,6 +508,29 @@ $WrapperComponent = "opaconfig"; }, ); +# We can improve ComponentInfo to include the following. But since they are used +# for mpisrc only, extending ComponentInfo doesn't benefit other components. +# We directly define them here where +# Dest => installation location +# SrcRpms => src rpms to install +# BuildScripts => build script to install +# MiscFiles => misc files, such as version file. This field includes 'Dest' +# and 'Src' to define the installed file name and source file +# name. For SrcRpms and BuildScript fields, the installed file +# name will be the same name as source file. +# DirtyFiles => dirty files will be cleared during install/uninstall, such +# as the build generated files. +%ExtraMpisrcInfo = ( + Dest => "/usr/src/opa/MPI", + SrcRpms => ["mvapich2", "openmpi", "mpitests"], + BuildScripts => ["do_build", "do_mvapich2_build", "do_openmpi_build"], + MiscFiles => [{ + Dest => ".version", + Src => "version"}], + DirtyFiles => [ "{mvapich2,openmpi,mpitests}_*.rpm", + "make.*.{res,err,warn}", ".mpiinfo"] +); + # one of these opa_stack comp_info gets appended to ComponentInfo # for RHEL72 my %opa_stack_rhel72_comp_info = ( @@ -882,6 +912,36 @@ my %intel_hfi_rhel81_comp_info = ( }, ); +my %intel_hfi_rhel82_comp_info = ( + "intel_hfi" => { Name => "Intel HFI Components", + DefaultInstall => $State_Install, + SrcDir => file_glob("./IntelOPA-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 => "Intel HFI Components", @@ -1220,6 +1280,14 @@ sub init_components %opa_stack_dev_comp_info, %opa_stack_rhel_comp_info, ); + } elsif ( "$CUR_VENDOR_VER" eq "ES78" ) { + @Components = ( @Components_rhel78 ); + @SubComponents = ( @SubComponents_newer ); + %ComponentInfo = ( %ComponentInfo, %ibacm_comp_info, + %intel_hfi_comp_info, + %opa_stack_dev_comp_info, + %opa_stack_rhel_comp_info, + ); } elsif ( "$CUR_VENDOR_VER" eq "ES8" ) { @Components = ( @Components_rhel8 ); @SubComponents = ( @SubComponents_newer ); @@ -1236,6 +1304,14 @@ sub init_components %opa_stack_dev_comp_info, %opa_stack_rhel_comp_info, ); + } elsif ( "$CUR_VENDOR_VER" eq "ES82" ) { + @Components = ( @Components_rhel82 ); + @SubComponents = ( @SubComponents_newer ); + %ComponentInfo = ( %ComponentInfo, %ibacm_comp_info, + %intel_hfi_rhel82_comp_info, + %opa_stack_dev_comp_info, + %opa_stack_rhel_comp_info, + ); } elsif ( "$CUR_VENDOR_VER" eq "ES15" ) { @Components = ( @Components_sles15 ); @SubComponents = ( @SubComponents_newer ); @@ -1252,6 +1328,14 @@ sub init_components %opa_stack_dev_comp_info, %opa_stack_sles15_comp_info, ); + } elsif ( "$CUR_VENDOR_VER" eq "ES152" ) { + @Components = ( @Components_sles15_sp2 ); + @SubComponents = ( @SubComponents_newer ); + %ComponentInfo = ( %ComponentInfo, %ibacm_comp_info, + %intel_hfi_sles15_comp_info, + %opa_stack_dev_comp_info, + %opa_stack_sles15_comp_info, + ); } else { # unknown or unsupported distro, leave lists empty # verify_distrib_files will catch unsupported distro @@ -1691,10 +1775,11 @@ sub process_args Usage; } else { $GPU_Install=1; + $ComponentInfo{"openmpi_gcc_cuda_hfi"}{'Hidden'} = 0; + $ComponentInfo{"openmpi_gcc_cuda_hfi"}{'Disabled'} = 0; } } elsif ( "$arg" eq "-C" ) { - ShowComponents; - exit(0); + $To_Show_Comps = 1; } elsif ( "$arg" eq "-c" ) { # undocumented option to output detailed information on a component $Default_ShowCompInfo=1; @@ -1782,6 +1867,11 @@ sub process_args $last_arg=$arg; } } + + if ($To_Show_Comps == 1) { + ShowComponents; + exit(0); + } if ( $setcomp || $setenabled || $setdisabled || $setosver || $setbuildtemp || $setfwmode || $setanswer) { printf STDERR "Missing argument for option: $last_arg\n"; Usage; diff --git a/CommonInstall/ofed_firmware.pl b/CommonInstall/ofed_firmware.pl index 221d30d..7603cf3 100755 --- a/CommonInstall/ofed_firmware.pl +++ b/CommonInstall/ofed_firmware.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/overrides_delta.pl b/CommonInstall/overrides_delta.pl index 4426c0f..dc9ac64 100644 --- a/CommonInstall/overrides_delta.pl +++ b/CommonInstall/overrides_delta.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] @@ -78,6 +78,10 @@ my @delta_Components_rhel77 = ( "opa_stack", "mpi_selector", "intel_hfi", "opa_stack_dev", "delta_ipoib", "delta_debug", ); +my @delta_Components_rhel78 = ( "opa_stack", "mpi_selector", "intel_hfi", + "opa_stack_dev", + "delta_ipoib", + "delta_debug", ); my @delta_Components_rhel8 = ( "opa_stack", "mpi_selector", "intel_hfi", "opa_stack_dev", "delta_ipoib", @@ -86,6 +90,10 @@ my @delta_Components_rhel81 = ( "opa_stack", "mpi_selector", "intel_hfi", "opa_stack_dev", "delta_ipoib", "delta_debug", ); +my @delta_Components_rhel82 = ( "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", @@ -94,6 +102,10 @@ my @delta_Components_sles15_sp1 = ( "opa_stack", "intel_hfi", "opa_stack_dev", "delta_ipoib", "delta_debug", ); +my @delta_Components_sles15_sp2 = ( "opa_stack", "intel_hfi", + "opa_stack_dev", + "delta_ipoib", + "delta_debug", ); @Components = ( ); # RHEL7.2, ibacm is a full component with rpms to install @@ -126,14 +138,20 @@ sub overrides() @Components = ( @delta_Components_rhel76 ); } elsif ( "$CUR_VENDOR_VER" eq "ES77" ) { @Components = ( @delta_Components_rhel77 ); + } elsif ( "$CUR_VENDOR_VER" eq "ES78" ) { + @Components = ( @delta_Components_rhel78 ); } elsif ( "$CUR_VENDOR_VER" eq "ES8" ) { @Components = ( @delta_Components_rhel8 ); } elsif ( "$CUR_VENDOR_VER" eq "ES81" ) { @Components = ( @delta_Components_rhel81 ); + } elsif ( "$CUR_VENDOR_VER" eq "ES82" ) { + @Components = ( @delta_Components_rhel82 ); } elsif ( "$CUR_VENDOR_VER" eq "ES15" ) { @Components = ( @delta_Components_sles15 ); } elsif ( "$CUR_VENDOR_VER" eq "ES151" ) { @Components = ( @delta_Components_sles15_sp1 ); + } elsif ( "$CUR_VENDOR_VER" eq "ES152" ) { + @Components = ( @delta_Components_sles15_sp2 ); } else { # unsupported OS @Components = ( ); diff --git a/CommonInstall/util_basicfile.pl b/CommonInstall/util_basicfile.pl index 53cbbcb..045e8e4 100755 --- a/CommonInstall/util_basicfile.pl +++ b/CommonInstall/util_basicfile.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/util_basicio.pl b/CommonInstall/util_basicio.pl index 7bcd513..89a134e 100755 --- a/CommonInstall/util_basicio.pl +++ b/CommonInstall/util_basicio.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/util_blacklist.pl b/CommonInstall/util_blacklist.pl index 8d819fc..fe72442 100755 --- a/CommonInstall/util_blacklist.pl +++ b/CommonInstall/util_blacklist.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/util_build.pl b/CommonInstall/util_build.pl index 2169db7..89a96d2 100755 --- a/CommonInstall/util_build.pl +++ b/CommonInstall/util_build.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/util_components.pl b/CommonInstall/util_components.pl index d0da409..1575232 100755 --- a/CommonInstall/util_components.pl +++ b/CommonInstall/util_components.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] @@ -332,6 +332,8 @@ my %StartupComponent = (); # has component been installed since last configured autostart my %ComponentWasInstalled = (); +my %ExtraMpisrcInfo = (); + # constants for autostart functions $configure argument my $Start_Unspecified=0; my $Start_NoStart=1; @@ -364,24 +366,24 @@ sub ShowCompInfo(;$) } else { print $print_param ",\n {\n"; } - print $print_param " \"id\": \"$comp\",\n"; - my $description = $ComponentInfo{$comp}{'Name'}; - print $print_param " \"description\": \"$description\",\n"; + print $print_param " \"ID\": \"$comp\",\n"; + my $name = $ComponentInfo{$comp}{'Name'}; + print $print_param " \"Name\": \"$name\",\n"; if ( $comp eq "delta_debug" ) { print $print_param " \"error\": \"Not apply. We ship debug rpms in meta pkg _debuginfo.\"\n"; print $print_param " },\n"; next; } if (comp_is_available($comp)) { - print $print_param " \"available\": \"yes\",\n"; + print $print_param " \"Available\": \"yes\",\n"; } else { - print $print_param " \"available\": \"no\",\n"; + print $print_param " \"Available\": \"no\",\n"; } my $full_ver = comp_media_version($comp); my ($version, $release) = GetVerRel($full_ver); - print $print_param " \"version\": \"$version\",\n"; - print $print_param " \"release\": \"$release\",\n"; - print $print_param " \"prereqs\": [\n"; + print $print_param " \"Version\": \"$version\",\n"; + print $print_param " \"Release\": \"$release\",\n"; + print $print_param " \"PreReq\": [\n"; $first_item = 1; my @reqs = split(/ /, $ComponentInfo{$comp}{'PreReq'}); foreach my $req (@reqs) { @@ -393,15 +395,15 @@ sub ShowCompInfo(;$) $reqver = "$version-$release"; if ($first_item == 1) { $first_item = 0; - print $print_param " {\"id\": \"$req\", \"version\": \"$reqver\"}"; + print $print_param " {\"ID\": \"$req\", \"Version\": \"$reqver\"}"; } else { - print $print_param ",\n {\"id\": \"$req\", \"version\": \"$reqver\"}"; + print $print_param ",\n {\"ID\": \"$req\", \"Version\": \"$reqver\"}"; } } } print $print_param "\n ],\n"; @reqs = split(/ /, $ComponentInfo{$comp}{'CoReq'}); - print $print_param " \"coreqs\": [\n"; + print $print_param " \"CoReq\": [\n"; $first_item = 1; foreach my $req (@reqs) { # ignore req that is not a component. This is for the case we do not @@ -412,21 +414,22 @@ sub ShowCompInfo(;$) $reqver = "$version-$release"; if ($first_item == 1) { $first_item = 0; - print $print_param " {\"id\": \"$req\", \"version\": \"$reqver\"}"; + print $print_param " {\"ID\": \"$req\", \"Version\": \"$reqver\"}"; } else { - print $print_param ",\n {\"id\": \"$req\", \"version\": \"$reqver\"}"; + print $print_param ",\n {\"ID\": \"$req\", \"Version\": \"$reqver\"}"; } } } print $print_param "\n ],\n"; if ( $comp eq "mpisrc" ) { - print $print_param " \"srcrpms\": {\n"; - print $print_param " \"dest\": \"/usr/src/opa/MPI/\",\n"; + print $print_param " \"SrcRpms\": {\n"; + my $destdir = $ExtraMpisrcInfo{'Dest'}; + print $print_param " \"Dest\": \"$destdir\",\n"; my $srcdir=$ComponentInfo{'mpisrc'}{'SrcDir'}; - print $print_param " \"source\": \"$srcdir\",\n"; - print $print_param " \"resources\": [\n"; + print $print_param " \"Source\": \"$srcdir\",\n"; + print $print_param " \"Resources\": [\n"; $first_item = 1; - foreach my $srpm ( "mvapich2", "openmpi", "mpitests" ) { + foreach my $srpm (@{$ExtraMpisrcInfo{'SrcRpms'}}) { my $srpmfile = file_glob("$srcdir/${srpm}-*.src.rpm"); if ( "$srpmfile" ne "" ) { my $file = my_basename($srpmfile); @@ -440,29 +443,60 @@ sub ShowCompInfo(;$) } print $print_param "\n ]\n"; print $print_param " },\n"; - print $print_param " \"tools\": {\n"; - print $print_param " \"dest\": \"/usr/src/opa/MPI/\",\n"; - print $print_param " \"source\": \"$srcdir\",\n"; - print $print_param " \"resources\": [\n"; - print $print_param " \"do_build\",\n"; - print $print_param " \"do_mvapich2_build\",\n"; - print $print_param " \"do_openmpi_build\"\n"; - print $print_param " ]\n"; + print $print_param " \"BuildScripts\": {\n"; + print $print_param " \"Dest\": \"$destdir\",\n"; + print $print_param " \"Source\": \"$srcdir\",\n"; + print $print_param " \"Resources\": [\n"; + $first_item = 1; + foreach my $script (@{$ExtraMpisrcInfo{'BuildScripts'}}) { + if ($first_item == 1) { + $first_item = 0; + print $print_param " \"$script\""; + } else { + print $print_param ",\n \"$script\""; + } + } + print $print_param "\n ]\n"; print $print_param " },\n"; - print $print_param " \"misc\": [\n"; - print $print_param " {\"dest\": \"/usr/src/opa/MPI/.version\", \"source\": \"$srcdir\", \"resource\": \"version\"}\n"; - print $print_param " ]\n"; + print $print_param " \"MiscFiles\": [\n"; + $first_item = 1; + foreach my $file (@{$ExtraMpisrcInfo{'MiscFiles'}}) { + my $src = ${$file}{'Src'}; + my $dest = ${$file}{'Dest'}; + if ($first_item == 1) { + $first_item = 0; + } else { + print $print_param ",\n"; + } + print $print_param " {\"Dest\": \"$destdir/$dest\", \"Src\": \"$srcdir/$src\"}"; + } + print $print_param "\n ],\n"; + print $print_param " \"DirtyFiles\": {\n"; + print $print_param " \"Dest\": \"$destdir\",\n"; + print $print_param " \"Source\": \"\",\n"; + print $print_param " \"Resources\": [\n"; + $first_item = 1; + foreach my $file (@{$ExtraMpisrcInfo{'DirtyFiles'}}) { + if ($first_item == 1) { + $first_item = 0; + print $print_param " \"$file\""; + } else { + print $print_param ",\n \"$file\""; + } + } + print $print_param "\n ]\n"; + print $print_param " }\n"; } else { - print $print_param " \"userrpms\": [\n"; + print $print_param " \"UserRpms\": [\n"; ShowRpmList($print_param, " ", "user", @{$ComponentInfo{$comp}{'UserRpms'}}); print $print_param "\n ],\n"; - print $print_param " \"kernelrpms\": [\n"; + print $print_param " \"KernelRpms\": [\n"; ShowRpmList($print_param, " ", $CUR_OS_VER, @{$ComponentInfo{$comp}{'KernelRpms'}}); print $print_param "\n ],\n"; - print $print_param " \"firmwarerpms\": [\n"; + print $print_param " \"FirmwareRpms\": [\n"; ShowRpmList($print_param, " ", "firmware", @{$ComponentInfo{$comp}{'FirmwareRpms'}}); print $print_param "\n ],\n"; - print $print_param " \"debugrpms\": [\n"; + print $print_param " \"DebugTpms\": [\n"; ShowRpmList($print_param, " ", "any", @{$ComponentInfo{$comp}{'DebugRpms'}}); print $print_param "\n ]\n"; } @@ -510,9 +544,9 @@ sub ShowRpmList($$$$@) } if ($first_item == 1) { $first_item = 0; - print $print_param "$prefix\{\"id\": \"$rpm\", \"version\": \"$version\"}"; + print $print_param "$prefix\{\"ID\": \"$rpm\", \"Version\": \"$version\"}"; } else { - print $print_param ",\n$prefix\{\"id\": \"$rpm\", \"version\": \"$version\"}"; + print $print_param ",\n$prefix\{\"ID\": \"$rpm\", \"Version\": \"$version\"}"; } } else { DebugPrint "Not found $rpm"; diff --git a/CommonInstall/util_configfile.pl b/CommonInstall/util_configfile.pl index 8ed527a..b593bcb 100755 --- a/CommonInstall/util_configfile.pl +++ b/CommonInstall/util_configfile.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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 **************************************** # diff --git a/CommonInstall/util_deb.pl b/CommonInstall/util_deb.pl index 9c8d2ba..3a03321 100755 --- a/CommonInstall/util_deb.pl +++ b/CommonInstall/util_deb.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/util_driver.pl b/CommonInstall/util_driver.pl index 80ac93d..8e7b4df 100755 --- a/CommonInstall/util_driver.pl +++ b/CommonInstall/util_driver.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/util_hosttools.pl b/CommonInstall/util_hosttools.pl index 7274801..d87dfda 100755 --- a/CommonInstall/util_hosttools.pl +++ b/CommonInstall/util_hosttools.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/util_ifcfg.pl b/CommonInstall/util_ifcfg.pl index d847b5e..a830441 100755 --- a/CommonInstall/util_ifcfg.pl +++ b/CommonInstall/util_ifcfg.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/util_init.pl b/CommonInstall/util_init.pl index 7768ac4..fb2979d 100755 --- a/CommonInstall/util_init.pl +++ b/CommonInstall/util_init.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl ## BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] @@ -321,12 +321,14 @@ sub determine_os_version() my %distroVendor = ( "rhel" => "redhat", "centos" => "redhat", - "sles" => "SuSE" + "sles" => "SuSE", + "sle_hpc" => "SuSE" ); my %network_conf_dir = ( "rhel" => $NETWORK_CONF_DIR, "centos" => $NETWORK_CONF_DIR, - "sles" => "/etc/sysconfig/network" + "sles" => "/etc/sysconfig/network", + "sle_hpc" => "/etc/sysconfig/network" ); my $os_id = `cat $os_release_file | grep '^ID=' | cut -d'=' -f2 | tr -d [\\"\\.0] | tr -d ["\n"]`; $CUR_DISTRO_VENDOR = $distroVendor{$os_id}; diff --git a/CommonInstall/util_linuxconfig.pl b/CommonInstall/util_linuxconfig.pl index e80ff0f..a7c0ca4 100755 --- a/CommonInstall/util_linuxconfig.pl +++ b/CommonInstall/util_linuxconfig.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/CommonInstall/util_rpm.pl b/CommonInstall/util_rpm.pl index 9851bd4..512cfdd 100755 --- a/CommonInstall/util_rpm.pl +++ b/CommonInstall/util_rpm.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] @@ -727,7 +727,7 @@ sub rpm_resolve($$) } else { my $osver = rpm_tr_os_version("$mode"); # OS version # we expect 1 match, ignore all other filenames returned - if ( "$CUR_VENDOR_VER" eq 'ES122' || "$CUR_VENDOR_VER" eq 'ES123' || "$CUR_VENDOR_VER" eq 'ES124' || "$CUR_VENDOR_VER" eq 'ES125' ||"$CUR_VENDOR_VER" eq 'ES15' || "$CUR_VENDOR_VER" eq 'ES151') { + if ( "$CUR_VENDOR_VER" eq 'ES122' || "$CUR_VENDOR_VER" eq 'ES123' || "$CUR_VENDOR_VER" eq 'ES124' || "$CUR_VENDOR_VER" eq 'ES125' ||"$CUR_VENDOR_VER" eq 'ES15' || "$CUR_VENDOR_VER" eq 'ES151' || "$CUR_VENDOR_VER" eq 'ES152' ) { DebugPrint("Checking for Kernel Rpm: ${rpmpath}-${osver}_k*.${cpu}.rpm\n"); $rpmfile = file_glob("${rpmpath}-${osver}_k*.${cpu}.rpm"); } else { diff --git a/CommonInstall/util_startup.pl b/CommonInstall/util_startup.pl index b8a3f06..c0020eb 100755 --- a/CommonInstall/util_startup.pl +++ b/CommonInstall/util_startup.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/Esm/Makefile.linux b/Esm/Makefile.linux index a14e69c..4ab2ebb 100644 --- a/Esm/Makefile.linux +++ b/Esm/Makefile.linux @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for Esm Project @@ -130,12 +130,21 @@ endif ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES76" PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_RHEL76.pl endif +ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES77" + PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_RHEL77.pl +endif +ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES78" + PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_RHEL78.pl +endif ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES8" PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_RHEL8.pl endif ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES81" PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_RHEL81.pl endif +ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES82" + PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_RHEL82.pl +endif ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES122" PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_SLES122.pl endif @@ -154,6 +163,9 @@ endif ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES151" PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_SLES151.pl endif +ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES152" + PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_SLES152.pl +endif # Source files to include in DSP File @@ -236,6 +248,10 @@ comp.pl: $(COMP_SOURCES) cat $(PREREQ_SOURCE) $(COMP_SOURCES) > comp.pl chmod +x comp.pl +fmbuild: fmbuild.base + cp $< $@ + sed -i "s/__FEATURE_SET__/$(OPA_FEATURE_SET)/" $@ + # install for includes, libs and cmds phases include $(TL_DIR)/Makerules/Maketargets.install @@ -277,7 +293,7 @@ endif cd $(PROJ_STAGE_DIR) && $(PATCH_BRAND) -m % "$(BUILD_BRAND)" INSTALL # package builds standard package -package: +package: fmbuild mkdir -p $(RELEASE_DIR) rm -f packaged_files dist_files cd $(STAGE_DIR) ; \ diff --git a/Esm/Makerules.project b/Esm/Makerules.project index c388370..65b3a61 100755 --- a/Esm/Makerules.project +++ b/Esm/Makerules.project @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** ## Rules for ALL_HOST project #=============================================================================# diff --git a/Esm/Makesettings.project b/Esm/Makesettings.project index 2c7d9e1..a2e05d2 100644 --- a/Esm/Makesettings.project +++ b/Esm/Makesettings.project @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** ## Make Settings at project level #=============================================================================# diff --git a/Esm/README b/Esm/README index 94096cb..996503b 100644 --- a/Esm/README +++ b/Esm/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/build.env b/Esm/build.env index a6c6f13..6bd9458 100644 --- a/Esm/build.env +++ b/Esm/build.env @@ -1,6 +1,6 @@ # Adjust the environment variables if necessary export PRODUCT=VIEO_HOST -export RELEASE_TAG=10_10_1_0_35 +export RELEASE_TAG=10_10_3_0_11 export BUILD_CONFIG=${BUILD_CONFIG:-"release"} export BUILD_WITH_STACK=OPENIB export LDENVFS= diff --git a/Esm/build_label b/Esm/build_label index 169c846..e4d1492 100644 --- a/Esm/build_label +++ b/Esm/build_label @@ -1 +1 @@ -Build of VIEO_HOST 12/26/19 23:59 Tag: VIEO_HOST_LINUX_opa-10_10_10_10_1_0_35 +Build of VIEO_HOST 06/30/20 23:58 Tag: VIEO_HOST_LINUX_opa-10_10_10_10_3_0_11 diff --git a/Esm/fm_install.sh b/Esm/fm_install.sh index 2099ac7..ee7c125 100755 --- a/Esm/fm_install.sh +++ b/Esm/fm_install.sh @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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 **************************************** [ -z "${BUILDDIR}" ] && BUILDDIR="." @@ -37,7 +37,7 @@ # exit 1 #fi -fm_mans="opafmcmd.8 opafmcmdall.8" +fm_mans="opafmcmd.8 opafmcmdall.8 opafmconfigpp.8" mkdir -p ${DESTDIR}/usr/sbin mkdir -p ${DESTDIR}/usr/lib/systemd/system diff --git a/Esm/fm_install.sh.base b/Esm/fm_install.sh.base index 2099ac7..ee7c125 100755 --- a/Esm/fm_install.sh.base +++ b/Esm/fm_install.sh.base @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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 **************************************** [ -z "${BUILDDIR}" ] && BUILDDIR="." @@ -37,7 +37,7 @@ # exit 1 #fi -fm_mans="opafmcmd.8 opafmcmdall.8" +fm_mans="opafmcmd.8 opafmcmdall.8 opafmconfigpp.8" mkdir -p ${DESTDIR}/usr/sbin mkdir -p ${DESTDIR}/usr/lib/systemd/system diff --git a/Esm/fmbuild b/Esm/fmbuild index 9664a03..4f031a9 100755 --- a/Esm/fmbuild +++ b/Esm/fmbuild @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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 **************************************** # This is the main build script used with the FM src rpm's %build operation diff --git a/Esm/fmbuild.base b/Esm/fmbuild.base index 9664a03..4f031a9 100755 --- a/Esm/fmbuild.base +++ b/Esm/fmbuild.base @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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 **************************************** # This is the main build script used with the FM src rpm's %build operation diff --git a/Esm/get_id_and_versionid.sh b/Esm/get_id_and_versionid.sh index fa3a58a..09ae69a 100755 --- a/Esm/get_id_and_versionid.sh +++ b/Esm/get_id_and_versionid.sh @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,12 +25,15 @@ # 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 **************************************** if [ -f /etc/os-release ] then id=$(grep ^ID= /etc/os-release | cut -f2 -d= | cut -f2 -d\") + if [[ "$id" == "sle_hpc" ]]; then + id="sles" + fi versionid=$(grep ^VERSION_ID= /etc/os-release | cut -f2 -d\") else if [ `uname -s` == "Darwin" ] diff --git a/Esm/ib/Makefile b/Esm/ib/Makefile index 99b6694..a394272 100755 --- a/Esm/ib/Makefile +++ b/Esm/ib/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for SM Module diff --git a/Esm/ib/Makerules.module b/Esm/ib/Makerules.module index d370bca..7d7ad4d 100644 --- a/Esm/ib/Makerules.module +++ b/Esm/ib/Makerules.module @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** ## Rules for SM module #=============================================================================# diff --git a/Esm/ib/README b/Esm/ib/README index 824e5db..7112836 100644 --- a/Esm/ib/README +++ b/Esm/ib/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/doc/cs/README b/Esm/ib/doc/cs/README index 2a87f97..cee95d0 100644 --- a/Esm/ib/doc/cs/README +++ b/Esm/ib/doc/cs/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/include/README b/Esm/ib/include/README index a22314f..c575ec1 100644 --- a/Esm/ib/include/README +++ b/Esm/ib/include/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/include/cs_g.h b/Esm/ib/include/cs_g.h index 359be6c..8fddf6f 100644 --- a/Esm/ib/include/cs_g.h +++ b/Esm/ib/include/cs_g.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/include/cs_log.h b/Esm/ib/include/cs_log.h index b0795e5..614652c 100644 --- a/Esm/ib/include/cs_log.h +++ b/Esm/ib/include/cs_log.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/include/fm_xml.h b/Esm/ib/include/fm_xml.h index 641d3a3..2178362 100644 --- a/Esm/ib/include/fm_xml.h +++ b/Esm/ib/include/fm_xml.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/include/hsm_com_srvr_api.h b/Esm/ib/include/hsm_com_srvr_api.h index d241bb2..cbeb233 100644 --- a/Esm/ib/include/hsm_com_srvr_api.h +++ b/Esm/ib/include/hsm_com_srvr_api.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/include/hsm_config_srvr_api.h b/Esm/ib/include/hsm_config_srvr_api.h index 1368061..d41357e 100644 --- a/Esm/ib/include/hsm_config_srvr_api.h +++ b/Esm/ib/include/hsm_config_srvr_api.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/include/hsm_config_srvr_data.h b/Esm/ib/include/hsm_config_srvr_data.h index 6d6c581..ceefb07 100644 --- a/Esm/ib/include/hsm_config_srvr_data.h +++ b/Esm/ib/include/hsm_config_srvr_data.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/include/ib_sm.h b/Esm/ib/include/ib_sm.h index f86491c..bc41e58 100644 --- a/Esm/ib/include/ib_sm.h +++ b/Esm/ib/include/ib_sm.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/include/ifs_g.h b/Esm/ib/include/ifs_g.h index 2c90c38..caec096 100644 --- a/Esm/ib/include/ifs_g.h +++ b/Esm/ib/include/ifs_g.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/include/mai_g.h b/Esm/ib/include/mai_g.h index 4287fc2..31fb9c0 100644 --- a/Esm/ib/include/mai_g.h +++ b/Esm/ib/include/mai_g.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/include/vs_g.h b/Esm/ib/include/vs_g.h index 48173a1..54359a8 100644 --- a/Esm/ib/include/vs_g.h +++ b/Esm/ib/include/vs_g.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/man/Makefile b/Esm/ib/man/Makefile index b6d7f30..82485bb 100644 --- a/Esm/ib/man/Makefile +++ b/Esm/ib/man/Makefile @@ -1,4 +1,30 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# +# 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 **************************************** # Makefile for IbaTools/man @@ -39,6 +65,7 @@ INCLUDE_TARGETS = \ MAN_PAGE_8_FILES = \ opafmcmd.8 \ opafmcmdall.8 \ + opafmconfigpp.8 \ # Add more man pages for chapter 8 MISC_FILES= \ $(MAN_PAGE_8_FILES) \ diff --git a/Esm/ib/man/opafmconfigpp.manPage b/Esm/ib/man/opafmconfigpp.manPage new file mode 100644 index 0000000..68ab5cf --- /dev/null +++ b/Esm/ib/man/opafmconfigpp.manPage @@ -0,0 +1,90 @@ +.\" .\" ********************************************************************* +.\" .\" * * +.\" .\" * Copyright 2015-2019, Intel Corporation * +.\" .\" * * +.\" .\" * All Rights Reserved. * +.\" .\" * * +.\" .\" ********************************************************************* + +.TH opafmconfigpp 8 "Intel Corporation" "Copyright(C) 2015\-2019" "IFSFFCLIRG (Man Page)" +.SH NAME +opafmconfigpp + + +.PP +Merges opafm.xml pre-process file with set of VirtualFabric and DeviceGroup XML files. +.SH Syntax +opafmconfigpp [-p \fIppfile\fR] [-o \fIoutput\fR] [-b] [-s] [-f] [-h] +.SH Options + +.TP 10 +-h + +Produces full help text. + +.TP 10 +-p \fIppfile\fR + +Specifies the file to preprocess. Default is /etc/opa-fm/opafm\(ulpp.xml. + +.TP 10 +-o \fIoutput\fR + +Specifies the output XML file. Default is /etc/opa-fm/opafm.xml. + +.TP 10 +-b + +Backs up the old output file if one exists. Default is 0. + +.TP 10 +-s + +Skips running Config Check on output. Default is 0. + +.TP 10 +-f + +Forces overwrite of old output file. Default is 0. + +.SH Notes + +.PP +The output file will contain two comments at the top, along with the local time it was generated. +.PP +The special INCLUDE comments follow this style: +.PP + +.br + +.br + + + +.br + +.PP +Examples: +.PP + +.br + +.br + + +.br + + +.br + + + +.br + +.PP +INCLUDE comments will be replaced with contents of the given directories. +.SH Example +opafmconfigpp +.br + +opafmconfigpp -b -s diff --git a/Esm/ib/src/Makefile b/Esm/ib/src/Makefile index b1ad919..b477892 100755 --- a/Esm/ib/src/Makefile +++ b/Esm/ib/src/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for SM Module diff --git a/Esm/ib/src/README b/Esm/ib/src/README index 65940e9..ab2297a 100644 --- a/Esm/ib/src/README +++ b/Esm/ib/src/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/src/config/Makefile b/Esm/ib/src/config/Makefile index 0d524df..9584533 100644 --- a/Esm/ib/src/config/Makefile +++ b/Esm/ib/src/config/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for SM Module diff --git a/Esm/ib/src/config/README b/Esm/ib/src/config/README index 75725df..a84b0e3 100644 --- a/Esm/ib/src/config/README +++ b/Esm/ib/src/config/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/src/config/fm_digest.c b/Esm/ib/src/config/fm_digest.c index 7a2b295..ad4745a 100644 --- a/Esm/ib/src/config/fm_digest.c +++ b/Esm/ib/src/config/fm_digest.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/config/fm_digest.h b/Esm/ib/src/config/fm_digest.h index 7d6a41e..14e277b 100644 --- a/Esm/ib/src/config/fm_digest.h +++ b/Esm/ib/src/config/fm_digest.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/config/fm_xml.c b/Esm/ib/src/config/fm_xml.c index 3acb6b1..43b7e6d 100644 --- a/Esm/ib/src/config/fm_xml.c +++ b/Esm/ib/src/config/fm_xml.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -242,7 +242,7 @@ int getXMLConfigData(uint8_t *buffer, uint32_t bufflen, uint32_t *filelen) buffer[index++] = nextByte; if (index >= bufflen) { *filelen = 0; - IB_LOG_ERROR("Buffer overrun geting ESM config file! rc:",0x0020); + IB_LOG_ERROR("Buffer overrun getting ESM config file! rc:",0x0020); fclose(file); return -1; } @@ -940,7 +940,7 @@ void BasisU8XmlParserEnd(IXmlParserState_t *state, const IXML_FIELD *field, void return; } if (!content) { - IXmlParserPrintError(state, "Invald %s tag value, cannot be empty", field->tag); + IXmlParserPrintError(state, "Invalid %s tag value, cannot be empty", field->tag); return; } @@ -5452,7 +5452,7 @@ static void SmMcastDgXmlParserEnd(IXmlParserState_t *state, const IXML_FIELD *fi // if the group is disabled; skip it if (mdgp->def_mc_create == 0) { if (xml_parse_debug) - fprintf(stdout, "MulticastGroup ingnored: Create == 0\n"); + fprintf(stdout, "MulticastGroup ignored: Create == 0\n"); goto cleanup; } @@ -6740,7 +6740,7 @@ static void FeTrapNumberParserEnd(IXmlParserState_t *state, const IXML_FIELD *fi } if (feTrapSubInstance >= FE_MAX_TRAP_SUBS && trap_num != TRAP_ALL) { - IXmlParserPrintWarning(state, "Trap Subscriptions Limit Excceded, only %u Subscriptions. Trap %u will be ignored", + IXmlParserPrintWarning(state, "Trap Subscriptions Limit Exceeded, only %u Subscriptions. Trap %u will be ignored", FE_MAX_TRAP_SUBS, trap_num); return; } diff --git a/Esm/ib/src/cs/Makefile b/Esm/ib/src/cs/Makefile index 28f56ce..7d083e2 100644 --- a/Esm/ib/src/cs/Makefile +++ b/Esm/ib/src/cs/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for SM Module diff --git a/Esm/ib/src/cs/README b/Esm/ib/src/cs/README index c57b094..9feafb0 100644 --- a/Esm/ib/src/cs/README +++ b/Esm/ib/src/cs/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/src/cs/cs_bitset.c b/Esm/ib/src/cs/cs_bitset.c index 9a073fb..716bcbc 100644 --- a/Esm/ib/src/cs/cs_bitset.c +++ b/Esm/ib/src/cs/cs_bitset.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/cs/cs_context.c b/Esm/ib/src/cs/cs_context.c index 888535e..133365b 100644 --- a/Esm/ib/src/cs/cs_context.c +++ b/Esm/ib/src/cs/cs_context.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/cs/cs_csm_log.c b/Esm/ib/src/cs/cs_csm_log.c index 8fa0308..ef0477f 100644 --- a/Esm/ib/src/cs/cs_csm_log.c +++ b/Esm/ib/src/cs/cs_csm_log.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/cs/cs_queue.c b/Esm/ib/src/cs/cs_queue.c index cb8d2cb..eac1a34 100644 --- a/Esm/ib/src/cs/cs_queue.c +++ b/Esm/ib/src/cs/cs_queue.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -82,7 +82,7 @@ cs_Queue_ptr cs_queue_CreateQueue( Pool_t *pool, uint32_t MaxElements ) { que->Capacity = MaxElements; cs_queue_MakeEmpty( que ); IB_LOG_VERBOSE_FMT(__func__, - "Created Queue with entry count of %d and total Queue aize of %d", + "Created Queue with entry count of %d and total Queue size of %d", que->Capacity, qsize); } return que; diff --git a/Esm/ib/src/cs/cs_utility.c b/Esm/ib/src/cs/cs_utility.c index dd0c0ac..2b6a5b1 100644 --- a/Esm/ib/src/cs/cs_utility.c +++ b/Esm/ib/src/cs/cs_utility.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -396,7 +396,7 @@ cs_convert_status (Status_t status) { case VSTATUS_UNRECOVERABLE: return "108: unrecoverable error"; case VSTATUS_TIMEOUT_LIMIT: return "109: cumulative timeout limit reached"; case VSTATUS_ITERATOR_OUT_OF_DATE: return "119: data referred by case updated or deleted."; - case VSTATUS_INSUFFICIENT_PERMISSION: return "120: client has insufficient privillages"; + case VSTATUS_INSUFFICIENT_PERMISSION: return "120: client has insufficient privileges"; case VSTATUS_INVALID_CQ_HANDLE: return "126: CQ handle is invalid"; case VSTATUS_INVALID_FORMAT: return "127: Data format is invalid"; case VSTATUS_REJECT: return "128: Request rejected"; diff --git a/Esm/ib/src/cs/vs_pool_common.c b/Esm/ib/src/cs/vs_pool_common.c index 08f6747..f39d6e9 100644 --- a/Esm/ib/src/cs/vs_pool_common.c +++ b/Esm/ib/src/cs/vs_pool_common.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/cs/vs_thr_common.c b/Esm/ib/src/cs/vs_thr_common.c index e3d047e..1ba4353 100644 --- a/Esm/ib/src/cs/vs_thr_common.c +++ b/Esm/ib/src/cs/vs_thr_common.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/eeph/Makefile b/Esm/ib/src/eeph/Makefile index 96fa5a9..79343be 100755 --- a/Esm/ib/src/eeph/Makefile +++ b/Esm/ib/src/eeph/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for EEPH Module diff --git a/Esm/ib/src/eeph/lacp/Makefile b/Esm/ib/src/eeph/lacp/Makefile index f4451e6..971fb52 100755 --- a/Esm/ib/src/eeph/lacp/Makefile +++ b/Esm/ib/src/eeph/lacp/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for LACP Module diff --git a/Esm/ib/src/eeph_mux/Makefile b/Esm/ib/src/eeph_mux/Makefile index 57d2e5f..4d16985 100755 --- a/Esm/ib/src/eeph_mux/Makefile +++ b/Esm/ib/src/eeph_mux/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for Mux/Demux Module diff --git a/Esm/ib/src/eepha/Makefile b/Esm/ib/src/eepha/Makefile index bd41a0f..453921c 100755 --- a/Esm/ib/src/eepha/Makefile +++ b/Esm/ib/src/eepha/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for SM Module diff --git a/Esm/ib/src/fe/README b/Esm/ib/src/fe/README index 36cdabb..7e4144b 100644 --- a/Esm/ib/src/fe/README +++ b/Esm/ib/src/fe/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/src/fe/fe_lib/README b/Esm/ib/src/fe/fe_lib/README index 36bbb08..d9898af 100644 --- a/Esm/ib/src/fe/fe_lib/README +++ b/Esm/ib/src/fe/fe_lib/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/src/fe/fe_mad.c b/Esm/ib/src/fe/fe_mad.c index 3114b0f..29ee825 100644 --- a/Esm/ib/src/fe/fe_mad.c +++ b/Esm/ib/src/fe/fe_mad.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -129,7 +129,7 @@ uint32_t fe_vieo_init(uint8_t *logName) DM_IF3_MCLASS,&fd_dm); if (rc != VSTATUS_OK) { - IB_LOG_INFINI_INFORC("Failed to open Device Manager, wil try later. rc:", rc); + IB_LOG_INFINI_INFORC("Failed to open Device Manager, will try later. rc:", rc); fd_dm = INVALID_HANDLE; } diff --git a/Esm/ib/src/fe/fe_main.c b/Esm/ib/src/fe/fe_main.c index 8837423..1d9c4e0 100644 --- a/Esm/ib/src/fe/fe_main.c +++ b/Esm/ib/src/fe/fe_main.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/fe/fe_proc/Makefile b/Esm/ib/src/fe/fe_proc/Makefile index 33fb50a..2d8efab 100755 --- a/Esm/ib/src/fe/fe_proc/Makefile +++ b/Esm/ib/src/fe/fe_proc/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for SM Module diff --git a/Esm/ib/src/fe/fe_proc/README b/Esm/ib/src/fe/fe_proc/README index 5f003b5..3ebfdde 100644 --- a/Esm/ib/src/fe/fe_proc/README +++ b/Esm/ib/src/fe/fe_proc/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/src/fe/net/README b/Esm/ib/src/fe/net/README index 4ddc5fb..d557ed5 100644 --- a/Esm/ib/src/fe/net/README +++ b/Esm/ib/src/fe/net/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/src/fe/net/libnet.c b/Esm/ib/src/fe/net/libnet.c index b30bc64..847fc0f 100644 --- a/Esm/ib/src/fe/net/libnet.c +++ b/Esm/ib/src/fe/net/libnet.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -832,7 +832,7 @@ static NetConnection *NewConnection() { rc = vs_pool_alloc(&fe_pool,sizeof(NetConnection),(void *)&conn); if (rc != VSTATUS_OK) { - IB_LOG_ERROR0("Unable to allocate memory for a NetConnetion"); + IB_LOG_ERROR0("Unable to allocate memory for a NetConnection"); } else { memset(conn, 0, sizeof(NetConnection)); diff --git a/Esm/ib/src/fe/sa/README b/Esm/ib/src/fe/sa/README index 468c4f3..0e30adf 100644 --- a/Esm/ib/src/fe/sa/README +++ b/Esm/ib/src/fe/sa/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/src/fe/test/README b/Esm/ib/src/fe/test/README index 81c90ea..d5fb7a7 100644 --- a/Esm/ib/src/fe/test/README +++ b/Esm/ib/src/fe/test/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/src/ibaccess/README b/Esm/ib/src/ibaccess/README index b395aae..2227f9c 100644 --- a/Esm/ib/src/ibaccess/README +++ b/Esm/ib/src/ibaccess/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/src/ibaccess/cs_mad_openib.c b/Esm/ib/src/ibaccess/cs_mad_openib.c index 3b29884..0d05d0d 100644 --- a/Esm/ib/src/ibaccess/cs_mad_openib.c +++ b/Esm/ib/src/ibaccess/cs_mad_openib.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -419,7 +419,7 @@ ib_recv_sma(IBhandle_t handle, Mai_t *mai, uint64_t timeout) // get back at least header of our request if (status != FSUCCESS && status != FTIMEOUT && status != FREJECT) { // unexpected problem getting packets - IB_LOG_ERRORSTR("Recieved SMA status:", iba_fstatus_msg(status)); + IB_LOG_ERRORSTR("Received SMA status:", iba_fstatus_msg(status)); IB_EXIT(__func__, VSTATUS_BAD); return VSTATUS_BAD; } diff --git a/Esm/ib/src/ibaccess/vs_lck.c b/Esm/ib/src/ibaccess/vs_lck.c index 2f1c2ca..e180470 100644 --- a/Esm/ib/src/ibaccess/vs_lck.c +++ b/Esm/ib/src/ibaccess/vs_lck.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/ibaccess/vs_pool.c b/Esm/ib/src/ibaccess/vs_pool.c index aa9924c..1f94050 100644 --- a/Esm/ib/src/ibaccess/vs_pool.c +++ b/Esm/ib/src/ibaccess/vs_pool.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/ibaccess/vs_thr.c b/Esm/ib/src/ibaccess/vs_thr.c index 364b021..b57080a 100644 --- a/Esm/ib/src/ibaccess/vs_thr.c +++ b/Esm/ib/src/ibaccess/vs_thr.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/if3/Makefile b/Esm/ib/src/if3/Makefile index 9f7ccb7..f8b643f 100755 --- a/Esm/ib/src/if3/Makefile +++ b/Esm/ib/src/if3/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for SM Module diff --git a/Esm/ib/src/if3/README b/Esm/ib/src/if3/README index 2fed91b..d46ff07 100644 --- a/Esm/ib/src/if3/README +++ b/Esm/ib/src/if3/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/src/if3/felib.c b/Esm/ib/src/if3/felib.c index 8cf9632..41e8ab8 100644 --- a/Esm/ib/src/if3/felib.c +++ b/Esm/ib/src/if3/felib.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -577,7 +577,7 @@ if3_mngr_mad_init (Mai_t * madp, ManagerInfo_t * fp) madp->base.bversion = MAD_BVERSION; if (madp->base.mclass == MAD_CV_SUBN_ADM) { madp->base.cversion = SA_MAD_CVERSION; - IB_LOG_INFO("seting CVERSION for SA queries to 1.1 compliant seting ", + IB_LOG_INFO("setting CVERSION for SA queries to 1.1 compliant seting ", madp->base.cversion); } else madp->base.cversion = MAD_CVERSION; @@ -907,7 +907,7 @@ if3_open (uint32_t dev, uint32_t port, uint8_t mclass, IBhandle_t * pfd) mi->mclass = mclass; /* - * Now open mai and querry and other general incoming stuff + * Now open mai and query and other general incoming stuff */ rc = mai_open (MAI_GSI_QP, dev, port, &mi->fdr); @@ -1200,7 +1200,7 @@ if3_cntrl_cmd_send (IBhandle_t fd, uint8_t cmd) } if (rc != VSTATUS_OK && rc != VSTATUS_MAI_INTERNAL) { - IB_LOG_WARNRC("mai_recev failed rc:", rc); + IB_LOG_WARNRC("if3_recv failed rc:", rc); goto bail; } @@ -1241,7 +1241,7 @@ open_mngr_cnx(uint32_t dev, uint32_t port, mi->mclass = mclass; // - // open mai and querry and other general incoming stuff + // open mai and query and other general incoming stuff rc = mai_open(MAI_GSI_QP, dev, port, &mi->fdr); if (rc != VSTATUS_OK) { IB_LOG_ERRORRC("can't open mai rc:", rc); @@ -1529,7 +1529,7 @@ if3_mngr_open_cnx_fe (uint32_t dev, uint32_t port, uint16_t mclass, IBhandle_t * mi->mclass = mclass; /* - * Now open mai and querry and other general incoming stuff + * Now open mai and query and other general incoming stuff */ rc = mai_open (MAI_GSI_QP, dev, port, &mi->fdr); @@ -1872,7 +1872,7 @@ if3_dbsync_reply_to_mngr(IBhandle_t fhdl, Mai_t * fmad, // send DB Synch reply to the remote STL SM that issued the request if (VSTATUS_OK != (rc = rmpp_send_reply(fmad, rmpp_cntxt))) { - IB_LOG_ERROR_FMT(__func__, "Failed to foward RMPP request to manager: rc %d", rc); + IB_LOG_ERROR_FMT(__func__, "Failed to forward RMPP request to manager: rc %d", rc); } // deallocate the context rmpp_cntxt_release(rmpp_cntxt); @@ -2076,7 +2076,7 @@ if3_mngr_send_mad(IBhandle_t fd, SA_MAD *psa, uint32_t dataLength, uint8_t *buff // forward FEC or STL manager single MAD request to STL manager if (VSTATUS_OK != (rc = rmpp_send_request(&mad, fe_cntxt))) { - IB_LOG_ERROR_FMT(__func__, "Failed to foward RMPP request to manager: rc %d", rc); + IB_LOG_ERROR_FMT(__func__, "Failed to forward RMPP request to manager: rc %d", rc); } else { // release context for single MAD request rmpp_cntxt_full_release(fe_cntxt); @@ -2304,7 +2304,7 @@ if3_mngr_send_passthru_mad (IBhandle_t fd, SA_MAD *psa, uint32_t dataLength, // forward FEC or STL manager single MAD request to STL manager if (VSTATUS_OK != (rc = rmpp_send_request(&mad, fe_cntxt))) { - IB_LOG_ERROR_FMT(__func__, "Failed to foward RMPP request to manager: rc %d", rc); + IB_LOG_ERROR_FMT(__func__, "Failed to forward RMPP request to manager: rc %d", rc); } else { // release context for single MAD request rmpp_cntxt_full_release(fe_cntxt); @@ -3062,7 +3062,7 @@ if3_mngr_register_sa (IBhandle_t fd, uint8_t * servName, uint64_t servID, uint32 IB_LOG_ERROR0 ("too many service records at SA"); rc = VSTATUS_BUSY; } else { - IB_LOG_ERRORRC("error querrying SA rc:", rc); + IB_LOG_ERRORRC("error querying SA rc:", rc); } goto done; diff --git a/Esm/ib/src/if3/hsm_com_server.c b/Esm/ib/src/if3/hsm_com_server.c index c5d6833..cf0c3a2 100644 --- a/Esm/ib/src/if3/hsm_com_server.c +++ b/Esm/ib/src/if3/hsm_com_server.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/if3/hsm_com_srvr_api.c b/Esm/ib/src/if3/hsm_com_srvr_api.c index 93798b0..8f3ed4b 100644 --- a/Esm/ib/src/if3/hsm_com_srvr_api.c +++ b/Esm/ib/src/if3/hsm_com_srvr_api.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/if3/hsm_com_srvr_common.c b/Esm/ib/src/if3/hsm_com_srvr_common.c index 82835e5..60b1df8 100644 --- a/Esm/ib/src/if3/hsm_com_srvr_common.c +++ b/Esm/ib/src/if3/hsm_com_srvr_common.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/if3/hsm_com_srvr_data.h b/Esm/ib/src/if3/hsm_com_srvr_data.h index 2e40d08..5c0aec3 100644 --- a/Esm/ib/src/if3/hsm_com_srvr_data.h +++ b/Esm/ib/src/if3/hsm_com_srvr_data.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/if3/if3_ssl.c b/Esm/ib/src/if3/if3_ssl.c index e6810dd..f2582e6 100644 --- a/Esm/ib/src/if3/if3_ssl.c +++ b/Esm/ib/src/if3/if3_ssl.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -641,7 +641,7 @@ void * if3_ssl_accept(void *context, int clientfd) // required to present a certificate. For now, strict security // enforement is not enforced. if (!(cert = SSL_get_peer_certificate(session))) { - IB_LOG_INFINI_INFO_FMT(__func__, "Client has no certifcate to verfiy"); + IB_LOG_INFINI_INFO_FMT(__func__, "Client has no certificate to verify"); } else { long result; diff --git a/Esm/ib/src/if3/rmpp.c b/Esm/ib/src/if3/rmpp.c index 49a9096..b8032d2 100644 --- a/Esm/ib/src/if3/rmpp.c +++ b/Esm/ib/src/if3/rmpp.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -933,7 +933,7 @@ rmpp_send_multi_sa(Mai_t *maip, rmpp_cntxt_t *rmpp_cntxt) } if (chkSum != rmpp_cntxt->chkSum) { IB_LOG_ERROR_FMT(__func__, - "CHECKSUM FAILED [%d vs %d] for completeted %s[%s] RMPP TRANSACTION from LID[0x%x], TID["FMT_U64"]", + "CHECKSUM FAILED [%d vs %d] for completed %s[%s] RMPP TRANSACTION from LID[0x%x], TID["FMT_U64"]", chkSum, rmpp_cntxt->chkSum, info->rmpp_get_method_text((int)rmpp_cntxt->method), info->rmpp_get_aid_name((int)rmpp_cntxt->mad.base.mclass, (int)rmpp_cntxt->mad.base.aid), rmpp_cntxt->lid, rmpp_cntxt->tid); } @@ -2031,7 +2031,7 @@ rmpp_open_cnx( if ((-1 != (usrId = rmpp_is_cnx_open(fd))) && (info = rmpp_get_userinfo(usrId))) { if (info->partial_close) { if (if3DebugRmpp) - IB_LOG_WARN_FMT(__func__, "RMPP connection already openned for user %d", usrId); + IB_LOG_WARN_FMT(__func__, "RMPP connection already opened for user %d", usrId); // simply create the filters for a partially open RMPP connection if ((status = rmpp_create_filters(info, fd, fh_req_get, fh_req_gettable, mclass)) == VSTATUS_OK) { info->partial_close = 0; @@ -3660,7 +3660,7 @@ rmpp_send_multi_vendor(Mai_t *maip, rmpp_cntxt_t *rmpp_cntxt) } if (chkSum != rmpp_cntxt->chkSum) { IB_LOG_ERROR_FMT(__func__, - "CHECKSUM FAILED [%d vs %d] for completeted %s[%s] RMPP TRANSACTION from LID[0x%x], TID["FMT_U64"]", + "CHECKSUM FAILED [%d vs %d] for completed %s[%s] RMPP TRANSACTION from LID[0x%x], TID["FMT_U64"]", chkSum, rmpp_cntxt->chkSum, info->rmpp_get_method_text((int)rmpp_cntxt->method), info->rmpp_get_aid_name((int)rmpp_cntxt->mad.base.mclass, (int)rmpp_cntxt->mad.base.aid), rmpp_cntxt->lid, rmpp_cntxt->tid); } diff --git a/Esm/ib/src/if3/rmpp_l.h b/Esm/ib/src/if3/rmpp_l.h index 7d42c4b..7f6b649 100644 --- a/Esm/ib/src/if3/rmpp_l.h +++ b/Esm/ib/src/if3/rmpp_l.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/if3/vfi.c b/Esm/ib/src/if3/vfi.c index 9d2b0f3..56c6191 100644 --- a/Esm/ib/src/if3/vfi.c +++ b/Esm/ib/src/if3/vfi.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/linux/Makefile b/Esm/ib/src/linux/Makefile index a50fb5e..0a7c23f 100755 --- a/Esm/ib/src/linux/Makefile +++ b/Esm/ib/src/linux/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for SM Module diff --git a/Esm/ib/src/linux/README b/Esm/ib/src/linux/README index c240fee..90e6bf2 100644 --- a/Esm/ib/src/linux/README +++ b/Esm/ib/src/linux/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/src/linux/cs/usr/test/README b/Esm/ib/src/linux/cs/usr/test/README index bb453cb..1bb023d 100644 --- a/Esm/ib/src/linux/cs/usr/test/README +++ b/Esm/ib/src/linux/cs/usr/test/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/src/linux/fm_cmd/fm_cmd.c b/Esm/ib/src/linux/fm_cmd/fm_cmd.c index 9dcd2dd..c59d5ce 100644 --- a/Esm/ib/src/linux/fm_cmd/fm_cmd.c +++ b/Esm/ib/src/linux/fm_cmd/fm_cmd.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/linux/fm_cmd/hsm_com_client.c b/Esm/ib/src/linux/fm_cmd/hsm_com_client.c index 30dcbf8..1574a11 100644 --- a/Esm/ib/src/linux/fm_cmd/hsm_com_client.c +++ b/Esm/ib/src/linux/fm_cmd/hsm_com_client.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/linux/fm_cmd/hsm_com_client_api.c b/Esm/ib/src/linux/fm_cmd/hsm_com_client_api.c index 096f618..3094dce 100644 --- a/Esm/ib/src/linux/fm_cmd/hsm_com_client_api.c +++ b/Esm/ib/src/linux/fm_cmd/hsm_com_client_api.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/linux/fm_cmd/hsm_com_client_api.h b/Esm/ib/src/linux/fm_cmd/hsm_com_client_api.h index 821f47a..d3ed0a7 100644 --- a/Esm/ib/src/linux/fm_cmd/hsm_com_client_api.h +++ b/Esm/ib/src/linux/fm_cmd/hsm_com_client_api.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/linux/fm_cmd/hsm_com_client_common.c b/Esm/ib/src/linux/fm_cmd/hsm_com_client_common.c index 4d69260..67a8981 100644 --- a/Esm/ib/src/linux/fm_cmd/hsm_com_client_common.c +++ b/Esm/ib/src/linux/fm_cmd/hsm_com_client_common.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/linux/fm_cmd/hsm_com_client_data.h b/Esm/ib/src/linux/fm_cmd/hsm_com_client_data.h index 2d90163..2ab9024 100644 --- a/Esm/ib/src/linux/fm_cmd/hsm_com_client_data.h +++ b/Esm/ib/src/linux/fm_cmd/hsm_com_client_data.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/linux/fm_cmd/hsm_config_client.c b/Esm/ib/src/linux/fm_cmd/hsm_config_client.c index 2529bfb..6db8869 100644 --- a/Esm/ib/src/linux/fm_cmd/hsm_config_client.c +++ b/Esm/ib/src/linux/fm_cmd/hsm_config_client.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -540,7 +540,7 @@ fm_mgr_get_error_str { switch(err){ case FM_CONF_ERR_LEN: - return "Response data legth invalid"; + return "Response data length invalid"; case FM_CONF_ERR_VERSION: return "Client/Server version mismatch"; case FM_CONF_ERR_DISC: @@ -570,7 +570,7 @@ fm_mgr_get_error_str case FM_CONF_SEND_ERR: return "Send error"; case FM_CONF_INIT_ERR: - return "Could not initalize resource"; + return "Could not initialize resource"; case FM_CONF_NO_RESP: return "No Response"; case FM_CONF_MAX_ERROR_NUM: diff --git a/Esm/ib/src/linux/fm_cmd/hsm_config_client_api.h b/Esm/ib/src/linux/fm_cmd/hsm_config_client_api.h index d3d8a6a..05f1169 100644 --- a/Esm/ib/src/linux/fm_cmd/hsm_config_client_api.h +++ b/Esm/ib/src/linux/fm_cmd/hsm_config_client_api.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/linux/fm_cmd/hsm_config_client_data.h b/Esm/ib/src/linux/fm_cmd/hsm_config_client_data.h index 8887680..640bd93 100644 --- a/Esm/ib/src/linux/fm_cmd/hsm_config_client_data.h +++ b/Esm/ib/src/linux/fm_cmd/hsm_config_client_data.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/linux/fm_cmd/ssapi_internal.h b/Esm/ib/src/linux/fm_cmd/ssapi_internal.h index 50bc17f..e60a681 100755 --- a/Esm/ib/src/linux/fm_cmd/ssapi_internal.h +++ b/Esm/ib/src/linux/fm_cmd/ssapi_internal.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/linux/log/README b/Esm/ib/src/linux/log/README index 4cb0ef1..6bd8780 100644 --- a/Esm/ib/src/linux/log/README +++ b/Esm/ib/src/linux/log/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/src/linux/log/common/sqlite_messagelog.c b/Esm/ib/src/linux/log/common/sqlite_messagelog.c index b26c322..7cfc43b 100644 --- a/Esm/ib/src/linux/log/common/sqlite_messagelog.c +++ b/Esm/ib/src/linux/log/common/sqlite_messagelog.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/linux/log/common/sqlite_messagelog.h b/Esm/ib/src/linux/log/common/sqlite_messagelog.h index 38c1915..2807b98 100644 --- a/Esm/ib/src/linux/log/common/sqlite_messagelog.h +++ b/Esm/ib/src/linux/log/common/sqlite_messagelog.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/linux/log/common/vslog.c b/Esm/ib/src/linux/log/common/vslog.c index bc5ba32..56c03ba 100644 --- a/Esm/ib/src/linux/log/common/vslog.c +++ b/Esm/ib/src/linux/log/common/vslog.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/linux/log/test/tst_log.c b/Esm/ib/src/linux/log/test/tst_log.c index 5ed6a1d..076afd6 100755 --- a/Esm/ib/src/linux/log/test/tst_log.c +++ b/Esm/ib/src/linux/log/test/tst_log.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -117,7 +117,7 @@ int test_main_group(uint32_t mask) for(i=400;i<(1024-32);) { - printf("alog length %d\n",i); + printf("log length %d\n",i); IB_LOG_INFO("logging ",i); IB_LOG_DATA("data",data,i); i+=32; diff --git a/Esm/ib/src/linux/log/usr/Makefile b/Esm/ib/src/linux/log/usr/Makefile index 8058a04..ae64905 100755 --- a/Esm/ib/src/linux/log/usr/Makefile +++ b/Esm/ib/src/linux/log/usr/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for SM Module diff --git a/Esm/ib/src/linux/opafmvf/Makefile b/Esm/ib/src/linux/opafmvf/Makefile index c7fec70..751c629 100644 --- a/Esm/ib/src/linux/opafmvf/Makefile +++ b/Esm/ib/src/linux/opafmvf/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Include Make Control Settings diff --git a/Esm/ib/src/linux/opamkdsapdb/Makefile b/Esm/ib/src/linux/opamkdsapdb/Makefile index 941694f..291cd00 100644 --- a/Esm/ib/src/linux/opamkdsapdb/Makefile +++ b/Esm/ib/src/linux/opamkdsapdb/Makefile @@ -1,11 +1,11 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# -# * Redistributions of source executacode must retain the above copyright notice, +# +# * 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for SM Module diff --git a/Esm/ib/src/linux/opamkdsapdb/opamkdsapdb.c b/Esm/ib/src/linux/opamkdsapdb/opamkdsapdb.c index ad2eb9a..a62507d 100644 --- a/Esm/ib/src/linux/opamkdsapdb/opamkdsapdb.c +++ b/Esm/ib/src/linux/opamkdsapdb/opamkdsapdb.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT1 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/linux/opamkdsapdb/opamkdsapdb.h b/Esm/ib/src/linux/opamkdsapdb/opamkdsapdb.h index 6e6278b..c6075d4 100644 --- a/Esm/ib/src/linux/opamkdsapdb/opamkdsapdb.h +++ b/Esm/ib/src/linux/opamkdsapdb/opamkdsapdb.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/linux/rem_conf/README b/Esm/ib/src/linux/rem_conf/README index 16977d0..2c409f5 100644 --- a/Esm/ib/src/linux/rem_conf/README +++ b/Esm/ib/src/linux/rem_conf/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/src/linux/rem_conf/fos_snmp_discovery.c b/Esm/ib/src/linux/rem_conf/fos_snmp_discovery.c index 35ab138..ca4cb4a 100755 --- a/Esm/ib/src/linux/rem_conf/fos_snmp_discovery.c +++ b/Esm/ib/src/linux/rem_conf/fos_snmp_discovery.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -82,7 +82,7 @@ usage(char *cmd) fprintf(stderr, " -t \t\ttimeout in microseconds per snmp packet\n"); fprintf(stderr, - " -r \t\tNumber of retrys per request\n"); + " -r \t\tNumber of retries per request\n"); fprintf(stderr, " \n\n"); fflush(stderr); diff --git a/Esm/ib/src/linux/rem_conf/hsm_com_api.h b/Esm/ib/src/linux/rem_conf/hsm_com_api.h index cc9a132..76f97b3 100755 --- a/Esm/ib/src/linux/rem_conf/hsm_com_api.h +++ b/Esm/ib/src/linux/rem_conf/hsm_com_api.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/linux/rem_conf/hsm_com_data.h b/Esm/ib/src/linux/rem_conf/hsm_com_data.h index 17819f9..88d889e 100755 --- a/Esm/ib/src/linux/rem_conf/hsm_com_data.h +++ b/Esm/ib/src/linux/rem_conf/hsm_com_data.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/linux/rem_conf/hsm_com_lib.h b/Esm/ib/src/linux/rem_conf/hsm_com_lib.h index 81be6f9..907d5b5 100755 --- a/Esm/ib/src/linux/rem_conf/hsm_com_lib.h +++ b/Esm/ib/src/linux/rem_conf/hsm_com_lib.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/linux/rem_conf/hsm_com_test_data.h b/Esm/ib/src/linux/rem_conf/hsm_com_test_data.h index 35a1cc5..7eb7d51 100755 --- a/Esm/ib/src/linux/rem_conf/hsm_com_test_data.h +++ b/Esm/ib/src/linux/rem_conf/hsm_com_test_data.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/linux/rem_conf/hsm_config_api.h b/Esm/ib/src/linux/rem_conf/hsm_config_api.h index 6e82c92..cbc4997 100755 --- a/Esm/ib/src/linux/rem_conf/hsm_config_api.h +++ b/Esm/ib/src/linux/rem_conf/hsm_config_api.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/linux/rem_conf/hsm_config_data.h b/Esm/ib/src/linux/rem_conf/hsm_config_data.h index 79ef70c..9b7cafa 100755 --- a/Esm/ib/src/linux/rem_conf/hsm_config_data.h +++ b/Esm/ib/src/linux/rem_conf/hsm_config_data.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/linux/rem_conf/test_client.c b/Esm/ib/src/linux/rem_conf/test_client.c index e60c6f2..6af08af 100755 --- a/Esm/ib/src/linux/rem_conf/test_client.c +++ b/Esm/ib/src/linux/rem_conf/test_client.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/linux/rem_conf/test_client_snmp.c b/Esm/ib/src/linux/rem_conf/test_client_snmp.c index 3c349ed..03d5bb2 100755 --- a/Esm/ib/src/linux/rem_conf/test_client_snmp.c +++ b/Esm/ib/src/linux/rem_conf/test_client_snmp.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/linux/rem_conf/test_server.c b/Esm/ib/src/linux/rem_conf/test_server.c index 7b9dba3..7c3e824 100755 --- a/Esm/ib/src/linux/rem_conf/test_server.c +++ b/Esm/ib/src/linux/rem_conf/test_server.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/linux/rpm/README b/Esm/ib/src/linux/rpm/README index ae1a708..3529b0d 100644 --- a/Esm/ib/src/linux/rpm/README +++ b/Esm/ib/src/linux/rpm/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/src/linux/startup/Makefile b/Esm/ib/src/linux/startup/Makefile index ad23e67..d039ad3 100644 --- a/Esm/ib/src/linux/startup/Makefile +++ b/Esm/ib/src/linux/startup/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for SM Module diff --git a/Esm/ib/src/linux/startup/README b/Esm/ib/src/linux/startup/README index 263d1ce..f04c225 100644 --- a/Esm/ib/src/linux/startup/README +++ b/Esm/ib/src/linux/startup/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/src/linux/startup/fm_config/Makefile b/Esm/ib/src/linux/startup/fm_config/Makefile index c4108fa..2270be9 100644 --- a/Esm/ib/src/linux/startup/fm_config/Makefile +++ b/Esm/ib/src/linux/startup/fm_config/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for SM Module diff --git a/Esm/ib/src/linux/startup/fm_config/config_check.c b/Esm/ib/src/linux/startup/fm_config/config_check.c index 2e4fa83..e700ec9 100644 --- a/Esm/ib/src/linux/startup/fm_config/config_check.c +++ b/Esm/ib/src/linux/startup/fm_config/config_check.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/linux/startup/fm_config/config_convert.c b/Esm/ib/src/linux/startup/fm_config/config_convert.c index bc23aec..09c157a 100644 --- a/Esm/ib/src/linux/startup/fm_config/config_convert.c +++ b/Esm/ib/src/linux/startup/fm_config/config_convert.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/linux/startup/fm_config/config_diff.sh b/Esm/ib/src/linux/startup/fm_config/config_diff.sh index 671daee..d8349f7 100755 --- a/Esm/ib/src/linux/startup/fm_config/config_diff.sh +++ b/Esm/ib/src/linux/startup/fm_config/config_diff.sh @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/Esm/ib/src/linux/startup/fm_config/config_generate.sh b/Esm/ib/src/linux/startup/fm_config/config_generate.sh index 8f6a779..455cd81 100755 --- a/Esm/ib/src/linux/startup/fm_config/config_generate.sh +++ b/Esm/ib/src/linux/startup/fm_config/config_generate.sh @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] @@ -395,7 +395,7 @@ else print_separator echo "By default a FM node will run a single FM on the 1st Port of the 1st HFI." echo "However, in larger configurations, a single FM node may be used to" - echo "manage multiple fabrics. Each such fabric would be contected to a different" + echo "manage multiple fabrics. Each such fabric would be connected to a different" echo "HFI port. Each HFI port is associated with a different FM instance." num_instances=0 default=y diff --git a/Esm/ib/src/linux/startup/fm_config/opafmconfigpp.sh b/Esm/ib/src/linux/startup/fm_config/opafmconfigpp.sh index d257d35..a98df0d 100755 --- a/Esm/ib/src/linux/startup/fm_config/opafmconfigpp.sh +++ b/Esm/ib/src/linux/startup/fm_config/opafmconfigpp.sh @@ -1,7 +1,7 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** # -# Copyright (c) 2018, Intel Corporation +# Copyright (c) 2015-2020, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/linux/startup/multitenant.config b/Esm/ib/src/linux/startup/multitenant.config index df789af..e7cd059 100644 --- a/Esm/ib/src/linux/startup/multitenant.config +++ b/Esm/ib/src/linux/startup/multitenant.config @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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] diff --git a/Esm/ib/src/linux/startup/opafm.sh b/Esm/ib/src/linux/startup/opafm.sh index 03b3d7d..c1a7c09 100644 --- a/Esm/ib/src/linux/startup/opafm.sh +++ b/Esm/ib/src/linux/startup/opafm.sh @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] @@ -113,7 +113,7 @@ Usage() echo " restart - restart (eg. stop then start) the selected instances/managers" >&2 echo " reload - reload configuration for the selected instances/managers" >&2 echo " sweep - force a fabric resweep for the selected instances/managers" >&2 - echo " status - show status (running/not runing/disabled) for the selected">&2 + echo " status - show status (running/not running/disabled) for the selected">&2 echo " instances/managers" >&2 echo >&2 echo " -i instance - an instance to start components for" >&2 diff --git a/Esm/ib/src/linux/startup/opafm_src.xml b/Esm/ib/src/linux/startup/opafm_src.xml index e9bf1d8..2087aa5 100644 --- a/Esm/ib/src/linux/startup/opafm_src.xml +++ b/Esm/ib/src/linux/startup/opafm_src.xml @@ -1828,6 +1828,7 @@ 300 0 + 1 diff --git a/Esm/ib/src/linux/startup/opafm_src.xml.base b/Esm/ib/src/linux/startup/opafm_src.xml.base index e9bf1d8..2087aa5 100644 --- a/Esm/ib/src/linux/startup/opafm_src.xml.base +++ b/Esm/ib/src/linux/startup/opafm_src.xml.base @@ -1828,6 +1828,7 @@ 300 0 + 1 diff --git a/Esm/ib/src/linux/startup/opafmctrl.sh b/Esm/ib/src/linux/startup/opafmctrl.sh index 5eb79a7..039e5d7 100755 --- a/Esm/ib/src/linux/startup/opafmctrl.sh +++ b/Esm/ib/src/linux/startup/opafmctrl.sh @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] @@ -50,7 +50,7 @@ usage() echo " stop - stop the selected instances/managers" >&2 echo " restart - restart (eg. stop then start) the selected instances/managers" >&2 echo " sweep - force a fabric resweep for the selected instances/managers" >&2 - echo " status - show status (running/not runing/disabled) for the selected">&2 + echo " status - show status (running/not running/disabled) for the selected">&2 echo " instances/managers" >&2 echo >&2 echo " -i instance - an instance to start components for" >&2 diff --git a/Esm/ib/src/linux/startup/opafmd.c b/Esm/ib/src/linux/startup/opafmd.c index 419c682..5d41daa 100644 --- a/Esm/ib/src/linux/startup/opafmd.c +++ b/Esm/ib/src/linux/startup/opafmd.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT1 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -696,7 +696,7 @@ int loadConfig(void){ selected_device[i].guid = guid; } if (!selected_device[i].guid || !selected_device[i].port) { - fprintf(stderr, "Invalid config detected! Coundn't find device for instance %d!.\n", i); + fprintf(stderr, "Invalid config detected! Couldn't find device for instance %d!.\n", i); releaseXmlConfig(xml_config, /* full */ 1); return 1; } diff --git a/Esm/ib/src/linux/startup/sm_capture.sh b/Esm/ib/src/linux/startup/sm_capture.sh index 1f8b612..910622e 100755 --- a/Esm/ib/src/linux/startup/sm_capture.sh +++ b/Esm/ib/src/linux/startup/sm_capture.sh @@ -1,11 +1,11 @@ #!/bin/sh # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/Esm/ib/src/mai/Makefile b/Esm/ib/src/mai/Makefile index 9952202..c00acca 100755 --- a/Esm/ib/src/mai/Makefile +++ b/Esm/ib/src/mai/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for SM Module diff --git a/Esm/ib/src/mai/README b/Esm/ib/src/mai/README index 27b89a7..c547327 100644 --- a/Esm/ib/src/mai/README +++ b/Esm/ib/src/mai/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/src/mai/mai.c b/Esm/ib/src/mai/mai.c index 68ae7c4..cff6c33 100644 --- a/Esm/ib/src/mai/mai.c +++ b/Esm/ib/src/mai/mai.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/mai/mai_config.c b/Esm/ib/src/mai/mai_config.c index 7a0b9a4..ea3260d 100644 --- a/Esm/ib/src/mai/mai_config.c +++ b/Esm/ib/src/mai/mai_config.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/mai/mai_dc.c b/Esm/ib/src/mai/mai_dc.c index 4963180..5d701f7 100644 --- a/Esm/ib/src/mai/mai_dc.c +++ b/Esm/ib/src/mai/mai_dc.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/mai/mai_fcmp.c b/Esm/ib/src/mai/mai_fcmp.c index 91752fd..a42282b 100644 --- a/Esm/ib/src/mai/mai_fcmp.c +++ b/Esm/ib/src/mai/mai_fcmp.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -813,8 +813,8 @@ maif_match(Mai_t * data, Filter_t * filter) filter->dev,filter->port,(int)filter->qp); IB_LOG_VERBOSE("filter value & mask",filter); - //IB_LOG_DATA("fliler value",&filter->value,sizeof(filter->value)); - //IB_LOG_DATA("fliler mask",&filter->mask,sizeof(filter->mask)); + //IB_LOG_DATA("filter value",&filter->value,sizeof(filter->value)); + //IB_LOG_DATA("filter mask",&filter->mask,sizeof(filter->mask)); if (filter->active & MAI_ACT_FMASK) { diff --git a/Esm/ib/src/mai/mai_filter.c b/Esm/ib/src/mai/mai_filter.c index 6239104..03fa708 100644 --- a/Esm/ib/src/mai/mai_filter.c +++ b/Esm/ib/src/mai/mai_filter.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/mai/mai_filter_common.c b/Esm/ib/src/mai/mai_filter_common.c index cbbb97c..41a1363 100644 --- a/Esm/ib/src/mai/mai_filter_common.c +++ b/Esm/ib/src/mai/mai_filter_common.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/mai/mai_futil.c b/Esm/ib/src/mai/mai_futil.c index 266b453..a6d279d 100644 --- a/Esm/ib/src/mai/mai_futil.c +++ b/Esm/ib/src/mai/mai_futil.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/mai/mai_info.h b/Esm/ib/src/mai/mai_info.h index 12e2aee..c163114 100644 --- a/Esm/ib/src/mai/mai_info.h +++ b/Esm/ib/src/mai/mai_info.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/mai/mai_tid.c b/Esm/ib/src/mai/mai_tid.c index 2bda25a..f049b68 100644 --- a/Esm/ib/src/mai/mai_tid.c +++ b/Esm/ib/src/mai/mai_tid.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/mai/mai_util.c b/Esm/ib/src/mai/mai_util.c index cdef2d9..8ac5f07 100644 --- a/Esm/ib/src/mai/mai_util.c +++ b/Esm/ib/src/mai/mai_util.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/mai/mal_l.h b/Esm/ib/src/mai/mal_l.h index 50db7df..a7555df 100755 --- a/Esm/ib/src/mai/mal_l.h +++ b/Esm/ib/src/mai/mal_l.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/mai/test/README b/Esm/ib/src/mai/test/README index 6ff3b87..11d599f 100644 --- a/Esm/ib/src/mai/test/README +++ b/Esm/ib/src/mai/test/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/src/pm/Makefile b/Esm/ib/src/pm/Makefile index 8b05a4c..ff1af82 100755 --- a/Esm/ib/src/pm/Makefile +++ b/Esm/ib/src/pm/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for SM Module diff --git a/Esm/ib/src/pm/include/pa_access.h b/Esm/ib/src/pm/include/pa_access.h index e610981..02635c5 100644 --- a/Esm/ib/src/pm/include/pa_access.h +++ b/Esm/ib/src/pm/include/pa_access.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT3 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/pm/include/pa_l.h b/Esm/ib/src/pm/include/pa_l.h index 72b0531..8193efe 100644 --- a/Esm/ib/src/pm/include/pa_l.h +++ b/Esm/ib/src/pm/include/pa_l.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/pm/include/pa_server.h b/Esm/ib/src/pm/include/pa_server.h index 5d52f47..3057665 100644 --- a/Esm/ib/src/pm/include/pa_server.h +++ b/Esm/ib/src/pm/include/pa_server.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT3 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/pm/include/pa_sth_old.h b/Esm/ib/src/pm/include/pa_sth_old.h index a207135..42d209d 100644 --- a/Esm/ib/src/pm/include/pa_sth_old.h +++ b/Esm/ib/src/pm/include/pa_sth_old.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/pm/include/pm_counters.h b/Esm/ib/src/pm/include/pm_counters.h index 59bf7e1..66ba9ed 100644 --- a/Esm/ib/src/pm/include/pm_counters.h +++ b/Esm/ib/src/pm/include/pm_counters.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/pm/include/pm_l.h b/Esm/ib/src/pm/include/pm_l.h index b12cfbf..0852807 100644 --- a/Esm/ib/src/pm/include/pm_l.h +++ b/Esm/ib/src/pm/include/pm_l.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/pm/include/pm_topology.h b/Esm/ib/src/pm/include/pm_topology.h index 1564174..9be6961 100644 --- a/Esm/ib/src/pm/include/pm_topology.h +++ b/Esm/ib/src/pm/include/pm_topology.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -1518,12 +1518,12 @@ static __inline uint8 ComputeErrBucket(uint32 errCnt, uint32 errThreshold) } void PmPrintExceededPort(char *buf, size_t bufSize, PmPort_t *pmportp, uint32 index, const char *statistic, uint32 threshold, uint32 value); -void PmPrintExceededPortDetailsIntegrity(char *exceededMessage, Pm_t *pm, PmPort_t *pmportp, PmPort_t *pmportneighborp, uint32 imageIndex); -void PmPrintExceededPortDetailsCongestion(char *exceededMessage, Pm_t *pm, PmPort_t *pmportp, PmPort_t *pmportneighborp, uint32 imageIndex); -void PmPrintExceededPortDetailsSmaCongestion(char *exceededMessage, Pm_t *pm, PmPort_t *pmportp, PmPort_t *pmportneighborp, uint32 imageIndex); -void PmPrintExceededPortDetailsBubble(char *exceededMessage, Pm_t *pm, PmPort_t *pmportp, PmPort_t *pmportneighborp, uint32 imageIndex); -void PmPrintExceededPortDetailsSecurity(char *exceededMessage, Pm_t *pm, PmPort_t *pmportp, PmPort_t *pmportneighborp, uint32 imageIndex); -void PmPrintExceededPortDetailsRouting(char *exceededMessage, Pm_t *pm, PmPort_t *pmportp, PmPort_t *pmportneighborp, uint32 imageIndex); +void PmPrintExceededPortDetailsIntegrity(char *exceededMessage, Pm_t *pm, PmPort_t *pmportp, PmPort_t *pmportneighborp, uint32 imageIndex, uint8 printErrorInfo); +void PmPrintExceededPortDetailsCongestion(char *exceededMessage, Pm_t *pm, PmPort_t *pmportp, PmPort_t *pmportneighborp, uint32 imageIndex, uint8 printErrorInfo); +void PmPrintExceededPortDetailsSmaCongestion(char *exceededMessage, Pm_t *pm, PmPort_t *pmportp, PmPort_t *pmportneighborp, uint32 imageIndex, uint8 printErrorInfo); +void PmPrintExceededPortDetailsBubble(char *exceededMessage, Pm_t *pm, PmPort_t *pmportp, PmPort_t *pmportneighborp, uint32 imageIndex, uint8 printErrorInfo); +void PmPrintExceededPortDetailsSecurity(char *exceededMessage, Pm_t *pm, PmPort_t *pmportp, PmPort_t *pmportneighborp, uint32 imageIndex, uint8 printErrorInfo); +void PmPrintExceededPortDetailsRouting(char *exceededMessage, Pm_t *pm, PmPort_t *pmportp, PmPort_t *pmportneighborp, uint32 imageIndex, uint8 printErrorInfo); void PmFinalizePortStats(Pm_t *pm, PmPort_t *portp, uint32 index); boolean PmTabulatePort(Pm_t *pm, PmPort_t *portp, uint32 index, uint32 *counterSelect); diff --git a/Esm/ib/src/pm/pa/Makefile b/Esm/ib/src/pm/pa/Makefile index 1be1aeb..2e7d4ab 100644 --- a/Esm/ib/src/pm/pa/Makefile +++ b/Esm/ib/src/pm/pa/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for SM Module diff --git a/Esm/ib/src/pm/pa/pa_access.c b/Esm/ib/src/pm/pa/pa_access.c index 657e451..5f52b08 100644 --- a/Esm/ib/src/pm/pa/pa_access.c +++ b/Esm/ib/src/pm/pa/pa_access.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT3 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -1839,7 +1839,7 @@ FSTATUS paGetMultiFocusPorts(Pm_t *pm, char *groupName, PmFocusPorts_t *pmFocusP IB_LOG_WARN_FMT(__func__, "Illegal range parameter: %d: must be greater than zero\n", range); return(FINVALID_PARAMETER | STL_MAD_STATUS_STL_PA_INVALID_PARAMETER); } else if (range > pm_config.subnet_size) { - IB_LOG_WARN_FMT(__func__, "Illegal range parameter: Exceeds maxmimum subnet size of %d\n", pm_config.subnet_size); + IB_LOG_WARN_FMT(__func__, "Illegal range parameter: Exceeds maximum subnet size of %d\n", pm_config.subnet_size); return(FINVALID_PARAMETER | STL_MAD_STATUS_STL_PA_INVALID_PARAMETER); } @@ -2035,7 +2035,7 @@ FSTATUS paGetExtFocusPorts(Pm_t *pm, char *groupName, PmFocusPorts_t *pmFocusPor IB_LOG_WARN_FMT(__func__, "Illegal range parameter: %d: must be greater than zero\n", range); return(FINVALID_PARAMETER | STL_MAD_STATUS_STL_PA_INVALID_PARAMETER); } else if (range > pm_config.subnet_size) { - IB_LOG_WARN_FMT(__func__, "Illegal range parameter: Exceeds maxmimum subnet size of %d\n", pm_config.subnet_size); + IB_LOG_WARN_FMT(__func__, "Illegal range parameter: Exceeds maximum subnet size of %d\n", pm_config.subnet_size); return(FINVALID_PARAMETER | STL_MAD_STATUS_STL_PA_INVALID_PARAMETER); } @@ -2744,7 +2744,7 @@ FSTATUS paGetExtVFFocusPorts(Pm_t *pm, char *vfName, PmFocusPorts_t *pmVFFocusPo IB_LOG_WARN_FMT(__func__, "Illegal range parameter: %d: must be greater than zero\n", range); return(FINVALID_PARAMETER | STL_MAD_STATUS_STL_PA_INVALID_PARAMETER); } else if (range > pm_config.subnet_size) { - IB_LOG_WARN_FMT(__func__, "Illegal range parameter: Exceeds maxmimum subnet size of %d\n", pm_config.subnet_size); + IB_LOG_WARN_FMT(__func__, "Illegal range parameter: Exceeds maximum subnet size of %d\n", pm_config.subnet_size); return(FINVALID_PARAMETER | STL_MAD_STATUS_STL_PA_INVALID_PARAMETER); } @@ -2876,7 +2876,7 @@ FSTATUS paGetVFFocusPorts(Pm_t *pm, char *vfName, PmFocusPorts_t *pmVFFocusPorts IB_LOG_WARN_FMT(__func__, "Illegal range parameter: %d: must be greater than zero\n", range); return(FINVALID_PARAMETER | STL_MAD_STATUS_STL_PA_INVALID_PARAMETER); } else if (range > pm_config.subnet_size) { - IB_LOG_WARN_FMT(__func__, "Illegal range parameter: Exceeds maxmimum subnet size of %d\n", pm_config.subnet_size); + IB_LOG_WARN_FMT(__func__, "Illegal range parameter: Exceeds maximum subnet size of %d\n", pm_config.subnet_size); return(FINVALID_PARAMETER | STL_MAD_STATUS_STL_PA_INVALID_PARAMETER); } diff --git a/Esm/ib/src/pm/pa/pa_categories.c b/Esm/ib/src/pm/pa/pa_categories.c index 6d5a273..dd74159 100644 --- a/Esm/ib/src/pm/pa/pa_categories.c +++ b/Esm/ib/src/pm/pa/pa_categories.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/pm/pa/pa_protocol.c b/Esm/ib/src/pm/pa/pa_protocol.c index 328bf00..3d94a04 100644 --- a/Esm/ib/src/pm/pa/pa_protocol.c +++ b/Esm/ib/src/pm/pa/pa_protocol.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -727,7 +727,7 @@ pa_send_multi(Mai_t *maip, pa_cntxt_t *pa_cntxt) } if (chkSum != pa_cntxt->chkSum) { IB_LOG_ERROR_FMT(__func__, - "CHECKSUM FAILED [%d vs %d] for completeted %s[%s] RMPP TRANSACTION from LID[0x%x], TID["FMT_U64"]", + "CHECKSUM FAILED [%d vs %d] for completed %s[%s] RMPP TRANSACTION from LID[0x%x], TID["FMT_U64"]", chkSum, pa_cntxt->chkSum, pa_getMethodText((int)pa_cntxt->method), pa_getAidName(pa_cntxt->mad.base.aid), pa_cntxt->lid, pa_cntxt->tid); } diff --git a/Esm/ib/src/pm/pa/pa_server.c b/Esm/ib/src/pm/pa/pa_server.c index d684abb..c1fb6e6 100644 --- a/Esm/ib/src/pm/pa/pa_server.c +++ b/Esm/ib/src/pm/pa/pa_server.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT3 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -528,7 +528,7 @@ pa_getPmConfigResp(Mai_t *maip, pa_cntxt_t* pa_cntxt) vStatus = vs_pool_size(&pm_pool, &memoryFootprint); if (vStatus != VSTATUS_OK) { - IB_LOG_WARN_FMT(__func__, "Unable to get MemmoryFootPrint vStatus: %u", vStatus ); + IB_LOG_WARN_FMT(__func__, "Unable to get memory footprint. vStatus: %u", vStatus ); memoryFootprint = (uint64)-1; } if (status == FSUCCESS) { @@ -2607,7 +2607,7 @@ pa_getVFPortCountersResp(Mai_t *maip, pa_cntxt_t* pa_cntxt) (flags & STL_PA_PC_FLAG_UNEXPECTED_CLEAR?" (Unexpected Clear)":""), (flags & STL_PA_PC_FLAG_CLEAR_FAIL?" (Clear Unsuccessful)":"")); IB_LOG_DEBUG2_FMT(__func__, " VF Name: %s", vfName); - IB_LOG_DEBUG2_FMT(__func__, "Perfromance:"); + IB_LOG_DEBUG2_FMT(__func__, "Performance:"); IB_LOG_DEBUG2_FMT(__func__, " Xmit Data: %10"PRIu64" MB (%"PRIu64" Flits)", response.portVFXmitData/FLITS_PER_MB, response.portVFXmitData); IB_LOG_DEBUG2_FMT(__func__, " Xmit Pkts: %10"PRIu64" ", response.portVFXmitPkts); diff --git a/Esm/ib/src/pm/pa/pa_sth_old.c b/Esm/ib/src/pm/pa/pa_sth_old.c index 38ee7a3..46b2065 100644 --- a/Esm/ib/src/pm/pa/pa_sth_old.c +++ b/Esm/ib/src/pm/pa/pa_sth_old.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/pm/pa/pa_utility.c b/Esm/ib/src/pm/pa/pa_utility.c index 1547200..5271eea 100644 --- a/Esm/ib/src/pm/pa/pa_utility.c +++ b/Esm/ib/src/pm/pa/pa_utility.c @@ -1,18 +1,18 @@ /* BEGIN_ICS_COPYRIGHT3 **************************************** -Copyright (c) 2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation 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. + * 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 diff --git a/Esm/ib/src/pm/pm/Makefile b/Esm/ib/src/pm/pm/Makefile index 2d67a93..e7c5a3c 100755 --- a/Esm/ib/src/pm/pm/Makefile +++ b/Esm/ib/src/pm/pm/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for SM Module diff --git a/Esm/ib/src/pm/pm/README b/Esm/ib/src/pm/pm/README index 9db931c..adace24 100644 --- a/Esm/ib/src/pm/pm/README +++ b/Esm/ib/src/pm/pm/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/src/pm/pm/pm.c b/Esm/ib/src/pm/pm/pm.c index afab773..4d42ed1 100644 --- a/Esm/ib/src/pm/pm/pm.c +++ b/Esm/ib/src/pm/pm/pm.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/pm/pm/pm_calc.c b/Esm/ib/src/pm/pm/pm_calc.c index e7d35c2..9c38fb8 100644 --- a/Esm/ib/src/pm/pm/pm_calc.c +++ b/Esm/ib/src/pm/pm/pm_calc.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -36,6 +36,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "pm_topology.h" #include #include +#include "stl_print.h" /* PrintDest_t */ extern CounterSelectMask_t LinkDownIgnoreMask; @@ -312,8 +313,143 @@ void PmPrintExceededPort(char *buf, size_t bufSize, PmPort_t *pmportp, uint32 in #define GET_NEIGHBOR_DELTA_VLCOUNTER(vlcntr, vl) \ (portImageNeighbor ? portImageNeighbor->DeltaStlVLPortCounters[vl].vlcntr : 0) +static __inline void +FormatStlPortErrorInfo(char *buf, size_t bufsize, PmCompositeErrorInfo_t *err, STLErrorInfoMask_t *mask) { + int i; + PrintDest_t str; + PrintDestInitBuffer(&str, buf, bufsize); + + // If mask is given and no bits are set return. + if (mask && mask->AsReg32 == 0) return; + + // If mask is not given assume print any with a valid status. + if ((!mask || mask->s.UncorrectableErrorInfo) && err->UncorrectableErrorInfo.s.Status) { + PrintFunc(&str, "UncErr[%u:%s] ", err->UncorrectableErrorInfo.s.ErrorCode, + UncorrectableErrorInfoToText(err->UncorrectableErrorInfo.s.ErrorCode)); + } + + if ((!mask || mask->s.PortRcvErrorInfo) && err->PortRcvErrorInfo.s.Status) { + PrintFunc(&str, "RcvErr[%u:%s]", err->PortRcvErrorInfo.s.ErrorCode, + PortRcvErrorInfoToText(err->PortRcvErrorInfo.s.ErrorCode)); + + if (err->PortRcvErrorInfo.s.ErrorCode == 1 + || (err->PortRcvErrorInfo.s.ErrorCode >= 4 && err->PortRcvErrorInfo.s.ErrorCode <= 12)) + { + // Flit 1 + PrintFunc(&str, "={F1=0x"); + for (i = 0; i < 8; i++) { + PrintFunc(&str, "%02x", err->PortRcvErrorInfo.ErrorInfo.EI1to12.PacketFlit1[i]); + } + PrintFunc(&str, ":%u", err->PortRcvErrorInfo.ErrorInfo.EI1to12.s.Flit1Bits); + //Flit 2 + PrintFunc(&str, ";F2=0x"); + for (i = 0; i < 8; i++) { + PrintFunc(&str, "%02x", err->PortRcvErrorInfo.ErrorInfo.EI1to12.PacketFlit2[i]); + } + PrintFunc(&str, ":%u} ", err->PortRcvErrorInfo.ErrorInfo.EI1to12.s.Flit2Bits); + } else if (err->PortRcvErrorInfo.s.ErrorCode == 13) { + PrintFunc(&str, "={F=0x"); + for (i = 0; i < 8; i++) { + PrintFunc(&str, "%02x", err->PortRcvErrorInfo.ErrorInfo.EI13.PacketBytes[i]); + } + PrintFunc(&str, ":%u} ", err->PortRcvErrorInfo.ErrorInfo.EI13.s.FlitBits); + } else { + PrintFunc(&str, " "); + } + } + + if ((!mask || mask->s.ExcessiveBufferOverrunInfo) && err->ExcessiveBufferOverrunInfo.s.Status) { + PrintFunc(&str, "ExsBufOvrn={SC=%u} ", err->ExcessiveBufferOverrunInfo.s.SC); + } + + if ((!mask || mask->s.FMConfigErrorInfo) && err->FMConfigErrorInfo.s.Status) { + PrintFunc(&str, "FmCfgErr[%u:%s]", err->FMConfigErrorInfo.s.ErrorCode, + FMConfigErrorInfoToText(err->FMConfigErrorInfo.s.ErrorCode)); + switch (err->FMConfigErrorInfo.s.ErrorCode) { + case 0: + case 1: + case 2: + case 8: + PrintFunc(&str, "={Distance=%u} ", err->FMConfigErrorInfo.ErrorInfo.EI0to2_8.Distance); + break; + case 3: + case 4: + case 5: + PrintFunc(&str, "={VL=%u} ", err->FMConfigErrorInfo.ErrorInfo.EI3to5.VL); + break; + case 6: + PrintFunc(&str, "={BadBits=%x} ", err->FMConfigErrorInfo.ErrorInfo.EI6.BadFlitBits); + break; + case 7: + PrintFunc(&str, "={SC=%x} ", err->FMConfigErrorInfo.ErrorInfo.EI7.SC); + break; + default: + PrintFunc(&str, " "); + } + } + + if ((!mask || mask->s.PortRcvSwitchRelayErrorInfo) && err->PortRcvSwitchRelayErrorInfo.s.Status) { + PrintFunc(&str, "RxSwRlyErr[%u:%s]", + err->PortRcvSwitchRelayErrorInfo.s.ErrorCode, + PortRcvSwitchRelayErrorInfoToText(err->PortRcvSwitchRelayErrorInfo.s.ErrorCode)); + switch (err->PortRcvSwitchRelayErrorInfo.s.ErrorCode) { + case 0: + PrintFunc(&str, "={DLID=0x%x;SLID=0x%x;SC=%u;RC=%u} ", + err->PortRcvSwitchRelayErrorInfo.ErrorInfo.EI0.DLID, + ((err->PortRcvSwitchRelayErrorInfo.SLID_23_16 << 16) + | err->PortRcvSwitchRelayErrorInfo.SLID_15_0), + err->PortRcvSwitchRelayErrorInfo.ErrorInfo.EI0.SC, + err->PortRcvSwitchRelayErrorInfo.s.RC); + break; + case 2: + PrintFunc(&str, "={DLID=0x%x;SLID=0x%x;EPortNum=%u;RC=%u} ", + ((err->PortRcvSwitchRelayErrorInfo.ErrorInfo.EI2.DLID_23_16 << 16) + | err->PortRcvSwitchRelayErrorInfo.ErrorInfo.EI2.DLID_15_0), + ((err->PortRcvSwitchRelayErrorInfo.SLID_23_16 << 16) + | err->PortRcvSwitchRelayErrorInfo.SLID_15_0), + err->PortRcvSwitchRelayErrorInfo.ErrorInfo.EI2.EgressPortNum, + err->PortRcvSwitchRelayErrorInfo.s.RC); + break; + case 3: + PrintFunc(&str, "={EPortNum=%u;SC=%u} ", + err->PortRcvSwitchRelayErrorInfo.ErrorInfo.EI3.EgressPortNum, + err->PortRcvSwitchRelayErrorInfo.ErrorInfo.EI3.SC); + break; + default: + PrintFunc(&str, " "); + } + } + + if ((!mask || mask->s.PortXmitConstraintErrorInfo) && err->PortXmitConstraintErrorInfo.s.Status) { + PrintFunc(&str, "TxCnstErr={pkey=0x%04x;SLID=0x%x} ", + err->PortXmitConstraintErrorInfo.P_Key, err->PortXmitConstraintErrorInfo.SLID); + } + + if ((!mask || mask->s.PortRcvConstraintErrorInfo) && err->PortRcvConstraintErrorInfo.s.Status) { + PrintFunc(&str, "RxCnstErr[%u:%s]={pkey=0x%04x;SLID=0x%x} ", + err->PortRcvConstraintErrorInfo.s.ErrorCode, + PortRcvConstraintErrorInfoToText(err->PortRcvConstraintErrorInfo.s.ErrorCode), + err->PortRcvConstraintErrorInfo.P_Key, err->PortRcvConstraintErrorInfo.SLID); + } +} + +static void PmPrintExceededPortDetailsErrorInfo(PmPort_t *pmportp, uint32 imageIndex, STLErrorInfoMask_t mask, char *buf) +{ + + // If one reg has a valid status and can be printed then print port + if (mask.AsReg32) { + IB_LOG_WARN_FMT(NULL, "ErrorInfo was set on %.*s Guid "FMT_U64" LID 0x%x Port %u: %s", + (int)sizeof(pmportp->pmnodep->nodeDesc.NodeString), (char *)pmportp->pmnodep->nodeDesc.NodeString, + pmportp->pmnodep->NodeGUID, pmportp->pmnodep->Image[imageIndex].lid, pmportp->portNum, buf); + } else { + IB_LOG_INFO_FMT(NULL, "ErrorInfo was set on %.*s Guid "FMT_U64" LID 0x%x Port %u: No data found", + (int)sizeof(pmportp->pmnodep->nodeDesc.NodeString), (char *)pmportp->pmnodep->nodeDesc.NodeString, + pmportp->pmnodep->NodeGUID, pmportp->pmnodep->Image[imageIndex].lid, pmportp->portNum); + } +} + void PmPrintExceededPortDetailsIntegrity(char *exceededMessage, Pm_t *pm, PmPort_t *pmportp, - PmPort_t *pmportneighborp, uint32 imageIndex) + PmPort_t *pmportneighborp, uint32 imageIndex, uint8 printErrorInfo) { PmPortImage_t *portImage = &pmportp->Image[imageIndex]; PmPortImage_t *portImageNeighbor = (pmportneighborp ? &pmportneighborp->Image[imageIndex] : NULL); @@ -379,12 +515,35 @@ void PmPrintExceededPortDetailsIntegrity(char *exceededMessage, Pm_t *pm, PmPort buffSpace -= strlen(logMessage); logMessage += strlen(logMessage); } - IB_LOG_WARN_FMT(NULL, "%s Details: %s", exceededMessage, message); + + if (printErrorInfo) { + if (portImage->u.s.gotErrorInfo) { + char buf[256] = {0}; + STLErrorInfoMask_t mask = {0}; + + mask.s.PortRcvErrorInfo = portImage->ErrorInfo.PortRcvErrorInfo.s.Status; + mask.s.UncorrectableErrorInfo = portImage->ErrorInfo.UncorrectableErrorInfo.s.Status; + mask.s.FMConfigErrorInfo = portImage->ErrorInfo.FMConfigErrorInfo.s.Status; + + FormatStlPortErrorInfo(buf, sizeof(buf), &portImage->ErrorInfo, &mask); + PmPrintExceededPortDetailsErrorInfo(pmportp, imageIndex, mask, buf); + } + + if (portImageNeighbor && portImageNeighbor->u.s.gotErrorInfo) { + char buf[256] = {0}; + STLErrorInfoMask_t mask = {0}; + + mask.s.ExcessiveBufferOverrunInfo = portImageNeighbor->ErrorInfo.ExcessiveBufferOverrunInfo.s.Status; + + FormatStlPortErrorInfo(buf, sizeof(buf), &portImageNeighbor->ErrorInfo, &mask); + PmPrintExceededPortDetailsErrorInfo(pmportneighborp, imageIndex, mask, buf); + } + } } void PmPrintExceededPortDetailsCongestion(char *exceededMessage, Pm_t *pm, PmPort_t *pmportp, - PmPort_t *pmportneighborp, uint32 imageIndex) + PmPort_t *pmportneighborp, uint32 imageIndex, uint8 printErrorInfo) { PmPortImage_t *portImage = &pmportp->Image[imageIndex]; PmPortImage_t *portImageNeighbor = (pmportneighborp ? &pmportneighborp->Image[imageIndex] : NULL); @@ -472,7 +631,7 @@ void PmPrintExceededPortDetailsCongestion(char *exceededMessage, Pm_t *pm, PmPor } void PmPrintExceededPortDetailsSmaCongestion(char *exceededMessage, Pm_t *pm, PmPort_t *pmportp, - PmPort_t *pmportneighborp, uint32 imageIndex) + PmPort_t *pmportneighborp, uint32 imageIndex, uint8 printErrorInfo) { PmPortImage_t *portImage = &pmportp->Image[imageIndex]; PmPortImage_t *portImageNeighbor = (pmportneighborp ? &pmportneighborp->Image[imageIndex] : NULL); @@ -547,7 +706,7 @@ void PmPrintExceededPortDetailsSmaCongestion(char *exceededMessage, Pm_t *pm, Pm } void PmPrintExceededPortDetailsBubble(char *exceededMessage, Pm_t *pm, PmPort_t *pmportp, - PmPort_t *pmportneighborp, uint32 imageIndex) + PmPort_t *pmportneighborp, uint32 imageIndex, uint8 printErrorInfo) { PmPortImage_t *portImage = &pmportp->Image[imageIndex]; PmPortImage_t *portImageNeighbor = (pmportneighborp ? &pmportneighborp->Image[imageIndex] : NULL); @@ -577,7 +736,8 @@ void PmPrintExceededPortDetailsBubble(char *exceededMessage, Pm_t *pm, PmPort_t exceededMessage, DeltaXmitWastedBW, DeltaXmitWaitData, XmitBubblePct, DeltaRcvBubble_N, RcvBubblePct); } -void PmPrintExceededPortDetailsSecurity(char *exceededMessage, Pm_t *pm, PmPort_t *pmportp, PmPort_t *pmportneighborp, uint32 imageIndex) +void PmPrintExceededPortDetailsSecurity(char *exceededMessage, Pm_t *pm, PmPort_t *pmportp, + PmPort_t *pmportneighborp, uint32 imageIndex, uint8 printErrorInfo) { PmPortImage_t *portImage = &pmportp->Image[imageIndex]; PmPortImage_t *portImageNeighbor = (pmportneighborp ? &pmportneighborp->Image[imageIndex] : NULL); @@ -585,15 +745,47 @@ void PmPrintExceededPortDetailsSecurity(char *exceededMessage, Pm_t *pm, PmPort_ IB_LOG_WARN_FMT(NULL, "%s Details: TxCE=%"PRIu64", neighbor RxCE=%"PRIu64" ", exceededMessage, GET_DELTA_COUNTER(PortXmitConstraintErrors), GET_NEIGHBOR_DELTA_COUNTER(PortRcvConstraintErrors)); + + if (printErrorInfo) { + if (portImage->u.s.gotErrorInfo) { + char buf[256] = {0}; + STLErrorInfoMask_t mask = {0}; + + mask.s.PortXmitConstraintErrorInfo = portImage->ErrorInfo.PortXmitConstraintErrorInfo.s.Status; + FormatStlPortErrorInfo(buf, sizeof(buf), &portImage->ErrorInfo, &mask); + PmPrintExceededPortDetailsErrorInfo(pmportp, imageIndex, mask, buf); + } + + if (portImageNeighbor && portImageNeighbor->u.s.gotErrorInfo) { + char buf[256] = {0}; + STLErrorInfoMask_t mask = {0}; + + mask.s.PortRcvConstraintErrorInfo = + portImageNeighbor->ErrorInfo.PortRcvConstraintErrorInfo.s.Status; + FormatStlPortErrorInfo(buf, sizeof(buf), &portImageNeighbor->ErrorInfo, &mask); + PmPrintExceededPortDetailsErrorInfo(pmportneighborp, imageIndex, mask, buf); + } + } } -void PmPrintExceededPortDetailsRouting(char *exceededMessage, Pm_t *pm, PmPort_t *pmportp, PmPort_t *pmportneighborp, uint32 imageIndex) + +void PmPrintExceededPortDetailsRouting(char *exceededMessage, Pm_t *pm, PmPort_t *pmportp, + PmPort_t *pmportneighborp, uint32 imageIndex, uint8 printErrorInfo) { PmPortImage_t *portImage = &pmportp->Image[imageIndex]; - /*PmPortImage_t *portImageNeighbor = (pmportneighborp ? &pmportneighborp->Image[imageIndex] : NULL); */ IB_LOG_WARN_FMT(NULL, "%s Details: RxSR=%"PRIu64" ", exceededMessage, GET_DELTA_COUNTER(PortRcvSwitchRelayErrors)); + + if (printErrorInfo && portImage->u.s.gotErrorInfo) { + char buf[256] = {0}; + STLErrorInfoMask_t mask = {0}; + + mask.s.PortRcvSwitchRelayErrorInfo = portImage->ErrorInfo.PortRcvSwitchRelayErrorInfo.s.Status; + FormatStlPortErrorInfo(buf, sizeof(buf), &portImage->ErrorInfo, &mask); + PmPrintExceededPortDetailsErrorInfo(pmportp, imageIndex, mask, buf); + } } + #undef GET_DELTA_COUNTER #undef GET_NEIGHBOR_DELTA_COUNTER #undef GET_DELTA_VLCOUNTER diff --git a/Esm/ib/src/pm/pm/pm_counters.c b/Esm/ib/src/pm/pm/pm_counters.c index 7ab6928..d20bf3d 100644 --- a/Esm/ib/src/pm/pm/pm_counters.c +++ b/Esm/ib/src/pm/pm/pm_counters.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/pm/pm/pm_dispatch.c b/Esm/ib/src/pm/pm/pm_dispatch.c index 541e137..026db7e 100644 --- a/Esm/ib/src/pm/pm/pm_dispatch.c +++ b/Esm/ib/src/pm/pm/pm_dispatch.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/pm/pm/pm_exit.c b/Esm/ib/src/pm/pm/pm_exit.c index 62fe451..6df7a76 100755 --- a/Esm/ib/src/pm/pm/pm_exit.c +++ b/Esm/ib/src/pm/pm/pm_exit.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/pm/pm/pm_groups.c b/Esm/ib/src/pm/pm/pm_groups.c index 2483f74..a1e0c10 100644 --- a/Esm/ib/src/pm/pm/pm_groups.c +++ b/Esm/ib/src/pm/pm/pm_groups.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/pm/pm/pm_pma.c b/Esm/ib/src/pm/pm/pm_pma.c index 2cb8fc6..d6e8d73 100644 --- a/Esm/ib/src/pm/pm/pm_pma.c +++ b/Esm/ib/src/pm/pm/pm_pma.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/pm/pm/pm_sweep.c b/Esm/ib/src/pm/pm/pm_sweep.c index f5c0462..95f6739 100644 --- a/Esm/ib/src/pm/pm/pm_sweep.c +++ b/Esm/ib/src/pm/pm/pm_sweep.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -143,6 +143,16 @@ typedef struct PmDbsyncSmInfo_s { PmDbsyncSmInfo_t basePmDbsyncSmInfo; PmDbsyncSmInfo_t newPmDbsyncSmInfo; +typedef struct _PmLogErrorInfoThresholds { + uint32_t Integrity; + uint32_t Security; + uint32_t Routing; + /* Following thresholds not supported */ + uint32_t Congestion; + uint32_t SmaCongestion; + uint32_t Bubble; +} PmLogErrorInfoThresholds_t; + /* Helper function to check if any add/delete changes happened to standby SMs. */ static void checkForChangesInStandbySMs(PmDbsyncSmInfo_t *base, PmDbsyncSmInfo_t *new) { @@ -1101,7 +1111,10 @@ PmNode_t *get_pmnodep(Pm_t *pm, Guid_t guid, STL_LID lid) pmnodep = PARENT_STRUCT(mi, PmNode_t, AllNodesEntry); AtomicIncrementVoid(&pmnodep->refCount); if (pm->LastSweepIndex == PM_IMAGE_INDEX_INVALID - || pmnodep != pm->Image[pm->LastSweepIndex].LidMap[lid]) { + || pmnodep->Image[pm->LastSweepIndex].lid != lid + || (lid < pm->Image[pm->LastSweepIndex].lidMapSize + && pmnodep != pm->Image[pm->LastSweepIndex].LidMap[lid])) + { // lid changed since last pm sweep #if 1 // clear out any previous redirect @@ -1755,7 +1768,7 @@ void threadDecompress(uint32_t argc, uint8_t **argv) { if (argc != 6) { - IB_LOG_ERROR ("Internal errror, invalid arguments", argc); + IB_LOG_ERROR ("Internal error, invalid arguments", argc); return; } @@ -1951,7 +1964,7 @@ void threadCompress(uint32_t argc, uint8_t **argv) { if (argc != 6) // the check avoids variable not used warning { - IB_LOG_ERROR ("Internal errror, invalid arguments", 0); + IB_LOG_ERROR ("Internal error, invalid arguments", 0); return; } @@ -4793,126 +4806,6 @@ void PmDestroy(Pm_t *pm) #endif } - -static __inline void -FormatStlPortErrorInfo(char *buf, size_t bufsize, PmCompositeErrorInfo_t *err, STLErrorInfoMask_t *mask) { - int i; - PrintDest_t str; - PrintDestInitBuffer(&str, buf, bufsize); - - // If mask is given and no bits are set return. - if (mask && mask->AsReg32 == 0) return; - - // If mask is not given assume print any with a valid status. - if ((!mask || mask->s.UncorrectableErrorInfo) && err->UncorrectableErrorInfo.s.Status) { - PrintFunc(&str, "UncErr[%u:%s] ", err->UncorrectableErrorInfo.s.ErrorCode, - UncorrectableErrorInfoToText(err->UncorrectableErrorInfo.s.ErrorCode)); - } - - if ((!mask || mask->s.PortRcvErrorInfo) && err->PortRcvErrorInfo.s.Status) { - PrintFunc(&str, "RcvErr[%u:%s]", err->PortRcvErrorInfo.s.ErrorCode, - PortRcvErrorInfoToText(err->PortRcvErrorInfo.s.ErrorCode)); - - if (err->PortRcvErrorInfo.s.ErrorCode == 1 - || (err->PortRcvErrorInfo.s.ErrorCode >= 4 && err->PortRcvErrorInfo.s.ErrorCode <= 12)) - { - // Flit 1 - PrintFunc(&str, "={F1=0x"); - for (i = 0; i < 8; i++) { - PrintFunc(&str, "%02x", err->PortRcvErrorInfo.ErrorInfo.EI1to12.PacketFlit1[i]); - } - PrintFunc(&str, ":%u", err->PortRcvErrorInfo.ErrorInfo.EI1to12.s.Flit1Bits); - //Flit 2 - PrintFunc(&str, ";F2=0x"); - for (i = 0; i < 8; i++) { - PrintFunc(&str, "%02x", err->PortRcvErrorInfo.ErrorInfo.EI1to12.PacketFlit2[i]); - } - PrintFunc(&str, ":%u} ", err->PortRcvErrorInfo.ErrorInfo.EI1to12.s.Flit2Bits); - } else if (err->PortRcvErrorInfo.s.ErrorCode == 13) { - PrintFunc(&str, "={F=0x"); - for (i = 0; i < 8; i++) { - PrintFunc(&str, "%02x", err->PortRcvErrorInfo.ErrorInfo.EI13.PacketBytes[i]); - } - PrintFunc(&str, ":%u} ", err->PortRcvErrorInfo.ErrorInfo.EI13.s.FlitBits); - } else { - PrintFunc(&str, " "); - } - } - - if ((!mask || mask->s.ExcessiveBufferOverrunInfo) && err->ExcessiveBufferOverrunInfo.s.Status) { - PrintFunc(&str, "ExsBufOvrn={SC=%u} ", err->ExcessiveBufferOverrunInfo.s.SC); - } - - if ((!mask || mask->s.FMConfigErrorInfo) && err->FMConfigErrorInfo.s.Status) { - PrintFunc(&str, "FmCfgErr[%u:%s]", err->FMConfigErrorInfo.s.ErrorCode, - FMConfigErrorInfoToText(err->FMConfigErrorInfo.s.ErrorCode)); - switch (err->FMConfigErrorInfo.s.ErrorCode) { - case 0: - case 1: - case 2: - case 8: - PrintFunc(&str, "={Distance=%u} ", err->FMConfigErrorInfo.ErrorInfo.EI0to2_8.Distance); - break; - case 3: - case 4: - case 5: - PrintFunc(&str, "={VL=%u} ", err->FMConfigErrorInfo.ErrorInfo.EI3to5.VL); - break; - case 6: - PrintFunc(&str, "={BadBits=%x} ", err->FMConfigErrorInfo.ErrorInfo.EI6.BadFlitBits); - break; - case 7: - PrintFunc(&str, "={SC=%x} ", err->FMConfigErrorInfo.ErrorInfo.EI7.SC); - break; - default: - PrintFunc(&str, " "); - } - } - - if ((!mask || mask->s.PortRcvSwitchRelayErrorInfo) && err->PortRcvSwitchRelayErrorInfo.s.Status) { - PrintFunc(&str, "RxSwRlyErr[%u:%s]", - err->PortRcvSwitchRelayErrorInfo.s.ErrorCode, - PortRcvSwitchRelayErrorInfoToText(err->PortRcvSwitchRelayErrorInfo.s.ErrorCode)); - switch (err->PortRcvSwitchRelayErrorInfo.s.ErrorCode) { - case 0: - PrintFunc(&str, "={DLID=0x%x;SLID=0x%x;SC=%u;RC=%u} ", - err->PortRcvSwitchRelayErrorInfo.ErrorInfo.EI0.DLID, - ((err->PortRcvSwitchRelayErrorInfo.SLID_23_16 << 16) - | err->PortRcvSwitchRelayErrorInfo.SLID_15_0), - err->PortRcvSwitchRelayErrorInfo.ErrorInfo.EI0.SC, - err->PortRcvSwitchRelayErrorInfo.s.RC); - break; - case 2: - PrintFunc(&str, "={DLID=0x%x;SLID=0x%x;EPortNum=%u;RC=%u} ", - ((err->PortRcvSwitchRelayErrorInfo.ErrorInfo.EI2.DLID_23_16 << 16) - | err->PortRcvSwitchRelayErrorInfo.ErrorInfo.EI2.DLID_15_0), - ((err->PortRcvSwitchRelayErrorInfo.SLID_23_16 << 16) - | err->PortRcvSwitchRelayErrorInfo.SLID_15_0), - err->PortRcvSwitchRelayErrorInfo.ErrorInfo.EI2.EgressPortNum, - err->PortRcvSwitchRelayErrorInfo.s.RC); - break; - case 3: - PrintFunc(&str, "={EPortNum=%u;SC=%u} ", - err->PortRcvSwitchRelayErrorInfo.ErrorInfo.EI3.EgressPortNum, - err->PortRcvSwitchRelayErrorInfo.ErrorInfo.EI3.SC); - break; - default: - PrintFunc(&str, " "); - } - } - - if ((!mask || mask->s.PortXmitConstraintErrorInfo) && err->PortXmitConstraintErrorInfo.s.Status) { - PrintFunc(&str, "TxCnstErr={pkey=0x%04x;SLID=0x%x} ", - err->PortXmitConstraintErrorInfo.P_Key, err->PortXmitConstraintErrorInfo.SLID); - } - - if ((!mask || mask->s.PortRcvConstraintErrorInfo) && err->PortRcvConstraintErrorInfo.s.Status) { - PrintFunc(&str, "RxCnstErr[%u:%s]={pkey=0x%04x;SLID=0x%x} ", - err->PortRcvConstraintErrorInfo.s.ErrorCode, - PortRcvConstraintErrorInfoToText(err->PortRcvConstraintErrorInfo.s.ErrorCode), - err->PortRcvConstraintErrorInfo.P_Key, err->PortRcvConstraintErrorInfo.SLID); - } -} // After all individual ports have been tabulated, we tabulate totals for // all groups. We must do this after port tabulation because some counters // need to look at both sides of a link to pick the max or combine error @@ -4924,12 +4817,12 @@ FormatStlPortErrorInfo(char *buf, size_t bufsize, PmCompositeErrorInfo_t *err, S static void PmFinalizeAllPortStats(Pm_t *pm) { PmThresholdsExceededMsgLimitXmlConfig_t thresholdsExceededMsgCount = {0}; - PmSweepErrorInfoThresholds_t thresholdsErrorInfoCount = {0}; + PmLogErrorInfoThresholds_t thresholdsErrorInfoCount = {0}, pmErrorInfoThresholds = {0}; STL_LID lid; PmImage_t *pmimagep = &pm->Image[pm->SweepIndex]; PmNode_t *pmnodep = NULL; PmPort_t *pmportp; - uint8 portnum; + uint8 portnum, printErrorInfoSummary=0; // get totalsLock so we can update RunningTotals and avoid any races // with paClearPortCounters @@ -4942,6 +4835,11 @@ static void PmFinalizeAllPortStats(Pm_t *pm) } } } + + pmErrorInfoThresholds.Integrity = pm_config.errorinfo_thresholds.Integrity; + pmErrorInfoThresholds.Security = pm_config.errorinfo_thresholds.Security; + pmErrorInfoThresholds.Routing = pm_config.errorinfo_thresholds.Routing; + (void)vs_rwunlock(&pm->totalsLock); // Log Ports which exceeded threshold up to ThresholdExceededMsgLimit @@ -4953,8 +4851,14 @@ static void PmFinalizeAllPortStats(Pm_t *pm) char buf[512]; \ PmPort_t *pmportp2 = pmportp->Image[pm->SweepIndex].neighbor; \ PmPrintExceededPort(buf, sizeof(buf), pmportp, pm->SweepIndex, #stat, pm->Thresholds.stat, stat); \ - PmPrintExceededPortDetails##stat(buf, pm, pmportp, pmportp2, pm->SweepIndex); \ + uint8 printErrorInfo = (pmErrorInfoThresholds.stat == IB_UINT32_MAX \ + || thresholdsErrorInfoCount.stat < pmErrorInfoThresholds.stat); \ + PmPrintExceededPortDetails##stat(buf, pm, pmportp, pmportp2, pm->SweepIndex, printErrorInfo); \ thresholdsExceededMsgCount.stat++; \ + if (printErrorInfo) { \ + thresholdsErrorInfoCount.stat++; \ + printErrorInfoSummary = 1; \ + } \ } \ } \ } while (0) @@ -4970,57 +4874,6 @@ static void PmFinalizeAllPortStats(Pm_t *pm) LOG_EXCEEDED_THRESHOLD(Bubble); LOG_EXCEEDED_THRESHOLD(Security); LOG_EXCEEDED_THRESHOLD(Routing); - - if (pmportp->Image[pm->SweepIndex].u.s.gotErrorInfo) { - char buf[256] = {0}; - STLErrorInfoMask_t mask = {0}; - - if (pm_config.errorinfo_thresholds.Integrity == IB_UINT32_MAX - || thresholdsErrorInfoCount.Integrity < pm_config.errorinfo_thresholds.Integrity) - { - mask.s.PortRcvErrorInfo - = pmportp->Image[pm->SweepIndex].ErrorInfo.PortRcvErrorInfo.s.Status; - mask.s.ExcessiveBufferOverrunInfo - = pmportp->Image[pm->SweepIndex].ErrorInfo.ExcessiveBufferOverrunInfo.s.Status; - mask.s.UncorrectableErrorInfo - = pmportp->Image[pm->SweepIndex].ErrorInfo.UncorrectableErrorInfo.s.Status; - mask.s.FMConfigErrorInfo - = pmportp->Image[pm->SweepIndex].ErrorInfo.FMConfigErrorInfo.s.Status; - - thresholdsErrorInfoCount.Integrity++; - } - if (pm_config.errorinfo_thresholds.Security == IB_UINT32_MAX - || thresholdsErrorInfoCount.Security < pm_config.errorinfo_thresholds.Security) - { - mask.s.PortXmitConstraintErrorInfo - = pmportp->Image[pm->SweepIndex].ErrorInfo.PortXmitConstraintErrorInfo.s.Status; - mask.s.PortRcvConstraintErrorInfo - = pmportp->Image[pm->SweepIndex].ErrorInfo.PortRcvConstraintErrorInfo.s.Status; - - thresholdsErrorInfoCount.Security++; - } - if (pm_config.errorinfo_thresholds.Routing == IB_UINT32_MAX - || thresholdsErrorInfoCount.Routing < pm_config.errorinfo_thresholds.Routing) - { - mask.s.PortRcvSwitchRelayErrorInfo - = pmportp->Image[pm->SweepIndex].ErrorInfo.PortRcvSwitchRelayErrorInfo.s.Status; - - thresholdsErrorInfoCount.Routing++; - } - - // If one reg has a valid status and can be printed then print port - if (mask.AsReg32) { - FormatStlPortErrorInfo(buf, sizeof(buf), &pmportp->Image[pm->SweepIndex].ErrorInfo, &mask); - IB_LOG_INFINI_INFO_FMT(NULL, "ErrorInfo was set on %.*s Guid "FMT_U64" LID 0x%x Port %u: %s", - (int)sizeof(pmnodep->nodeDesc.NodeString), (char *)pmnodep->nodeDesc.NodeString, - pmnodep->NodeGUID, lid, portnum, buf); - } else { - FormatStlPortErrorInfo(buf, sizeof(buf), &pmportp->Image[pm->SweepIndex].ErrorInfo, NULL); - IB_LOG_INFO_FMT(NULL, "ErrorInfo was set on %.*s Guid "FMT_U64" LID 0x%x Port %u: %s", - (int)sizeof(pmnodep->nodeDesc.NodeString), (char *)pmnodep->nodeDesc.NodeString, - pmnodep->NodeGUID, lid, portnum, buf); - } - } } } } @@ -5036,7 +4889,7 @@ static void PmFinalizeAllPortStats(Pm_t *pm) if (pmimagep->DowngradedPorts) IB_LOG_INFINI_INFO_FMT(__func__, "%u Port%s Downgraded", pmimagep->DowngradedPorts, pmimagep->DowngradedPorts > 1 ? "s were" : " was"); - if (pmimagep->ErrorInfoPorts) + if (printErrorInfoSummary && pmimagep->ErrorInfoPorts) IB_LOG_INFINI_INFO_FMT(__func__, "%u Port%s had ErrorInfo", pmimagep->ErrorInfoPorts, pmimagep->ErrorInfoPorts > 1 ? "s" : ""); } diff --git a/Esm/ib/src/pm/pm/pm_vfs.c b/Esm/ib/src/pm/pm/pm_vfs.c index 4f47965..0a51cc6 100644 --- a/Esm/ib/src/pm/pm/pm_vfs.c +++ b/Esm/ib/src/pm/pm/pm_vfs.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/README b/Esm/ib/src/smi/README index 837e11b..9ceaa4b 100644 --- a/Esm/ib/src/smi/README +++ b/Esm/ib/src/smi/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/src/smi/include/README b/Esm/ib/src/smi/include/README index e666c8e..2d28054 100644 --- a/Esm/ib/src/smi/include/README +++ b/Esm/ib/src/smi/include/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/src/smi/include/sa_l.h b/Esm/ib/src/smi/include/sa_l.h index 1e2e0af..d0d6328 100644 --- a/Esm/ib/src/smi/include/sa_l.h +++ b/Esm/ib/src/smi/include/sa_l.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/include/sm_activate.h b/Esm/ib/src/smi/include/sm_activate.h index 8298e65..81593b2 100644 --- a/Esm/ib/src/smi/include/sm_activate.h +++ b/Esm/ib/src/smi/include/sm_activate.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/include/sm_ar.h b/Esm/ib/src/smi/include/sm_ar.h index 750ea27..7b8a8bf 100755 --- a/Esm/ib/src/smi/include/sm_ar.h +++ b/Esm/ib/src/smi/include/sm_ar.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/include/sm_cable_info.h b/Esm/ib/src/smi/include/sm_cable_info.h index 19e1f78..1d27254 100644 --- a/Esm/ib/src/smi/include/sm_cable_info.h +++ b/Esm/ib/src/smi/include/sm_cable_info.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/include/sm_congestion.h b/Esm/ib/src/smi/include/sm_congestion.h index a016b76..8275f5e 100755 --- a/Esm/ib/src/smi/include/sm_congestion.h +++ b/Esm/ib/src/smi/include/sm_congestion.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/include/sm_counters.h b/Esm/ib/src/smi/include/sm_counters.h index 83c7da9..23f80d9 100644 --- a/Esm/ib/src/smi/include/sm_counters.h +++ b/Esm/ib/src/smi/include/sm_counters.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/include/sm_dbsync.h b/Esm/ib/src/smi/include/sm_dbsync.h index 95adad7..5026859 100644 --- a/Esm/ib/src/smi/include/sm_dbsync.h +++ b/Esm/ib/src/smi/include/sm_dbsync.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/include/sm_discovery.h b/Esm/ib/src/smi/include/sm_discovery.h index 316dc2b..d7c2f44 100644 --- a/Esm/ib/src/smi/include/sm_discovery.h +++ b/Esm/ib/src/smi/include/sm_discovery.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/include/sm_dor.h b/Esm/ib/src/smi/include/sm_dor.h index ff59fe6..3a1197d 100644 --- a/Esm/ib/src/smi/include/sm_dor.h +++ b/Esm/ib/src/smi/include/sm_dor.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/include/sm_l.h b/Esm/ib/src/smi/include/sm_l.h index 35aef1d..4d56378 100644 --- a/Esm/ib/src/smi/include/sm_l.h +++ b/Esm/ib/src/smi/include/sm_l.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/include/sm_lid_assignment.h b/Esm/ib/src/smi/include/sm_lid_assignment.h index ec278cc..561ff01 100644 --- a/Esm/ib/src/smi/include/sm_lid_assignment.h +++ b/Esm/ib/src/smi/include/sm_lid_assignment.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/include/sm_maihandle.h b/Esm/ib/src/smi/include/sm_maihandle.h index 9272620..f62edff 100644 --- a/Esm/ib/src/smi/include/sm_maihandle.h +++ b/Esm/ib/src/smi/include/sm_maihandle.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/include/sm_parallelsweep.h b/Esm/ib/src/smi/include/sm_parallelsweep.h index 4086293..e302c1e 100644 --- a/Esm/ib/src/smi/include/sm_parallelsweep.h +++ b/Esm/ib/src/smi/include/sm_parallelsweep.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/include/sm_pkeys.h b/Esm/ib/src/smi/include/sm_pkeys.h index 836c60d..f57932d 100644 --- a/Esm/ib/src/smi/include/sm_pkeys.h +++ b/Esm/ib/src/smi/include/sm_pkeys.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/include/sm_qos.h b/Esm/ib/src/smi/include/sm_qos.h index 7da372a..b731178 100644 --- a/Esm/ib/src/smi/include/sm_qos.h +++ b/Esm/ib/src/smi/include/sm_qos.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT1 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/include/sm_switch_info.h b/Esm/ib/src/smi/include/sm_switch_info.h index 5ffaf8b..8520a05 100644 --- a/Esm/ib/src/smi/include/sm_switch_info.h +++ b/Esm/ib/src/smi/include/sm_switch_info.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/include/sm_update_fields.h b/Esm/ib/src/smi/include/sm_update_fields.h index d7b9495..f598cc9 100644 --- a/Esm/ib/src/smi/include/sm_update_fields.h +++ b/Esm/ib/src/smi/include/sm_update_fields.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/include/stl_cca.h b/Esm/ib/src/smi/include/stl_cca.h index 8edfc35..0180464 100644 --- a/Esm/ib/src/smi/include/stl_cca.h +++ b/Esm/ib/src/smi/include/stl_cca.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sa/README b/Esm/ib/src/smi/sa/README index 94c140b..403bb2e 100755 --- a/Esm/ib/src/smi/sa/README +++ b/Esm/ib/src/smi/sa/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/src/smi/sa/sa_CongestionRecords.c b/Esm/ib/src/smi/sa/sa_CongestionRecords.c index 08c6951..e09bfa0 100644 --- a/Esm/ib/src/smi/sa/sa_CongestionRecords.c +++ b/Esm/ib/src/smi/sa/sa_CongestionRecords.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sa/sa_DeviceGroupMembership.c b/Esm/ib/src/smi/sa/sa_DeviceGroupMembership.c index 25b84dc..2229cdb 100644 --- a/Esm/ib/src/smi/sa/sa_DeviceGroupMembership.c +++ b/Esm/ib/src/smi/sa/sa_DeviceGroupMembership.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sa/sa_DeviceGroupName.c b/Esm/ib/src/smi/sa/sa_DeviceGroupName.c index e2cb987..26252e1 100644 --- a/Esm/ib/src/smi/sa/sa_DeviceGroupName.c +++ b/Esm/ib/src/smi/sa/sa_DeviceGroupName.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -162,7 +162,7 @@ sa_DeviceGroupName_GetTable(Mai_t *maip, uint32_t *records) { IB_LOG_WARN_FMT(__func__, "sa_create_template_mask failed. maip->base.aid 0x%x samad.header.mask 0x%"PRIx64, maip->base.aid, samad.header.mask); - IB_EXIT("sa_DevceiGroupRecord_GetTable", VSTATUS_OK); + IB_EXIT("sa_DeviceGroupRecord_GetTable", VSTATUS_OK); return VSTATUS_OK; } diff --git a/Esm/ib/src/smi/sa/sa_DeviceTree.c b/Esm/ib/src/smi/sa/sa_DeviceTree.c index 27c7e99..2d3100d 100644 --- a/Esm/ib/src/smi/sa/sa_DeviceTree.c +++ b/Esm/ib/src/smi/sa/sa_DeviceTree.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sa/sa_FabricInfoRecord.c b/Esm/ib/src/smi/sa/sa_FabricInfoRecord.c index 89b4388..666a769 100644 --- a/Esm/ib/src/smi/sa/sa_FabricInfoRecord.c +++ b/Esm/ib/src/smi/sa/sa_FabricInfoRecord.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sa/sa_McMemberRecord.c b/Esm/ib/src/smi/sa/sa_McMemberRecord.c index 4cee6a4..2aa9914 100644 --- a/Esm/ib/src/smi/sa/sa_McMemberRecord.c +++ b/Esm/ib/src/smi/sa/sa_McMemberRecord.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -1409,7 +1409,7 @@ sa_McMemberRecord_Delete(Topology_t *topop, Mai_t *maip, uint32_t *records) if ((mcGroup = sm_find_multicast_gid(mcmp->RID.MGID)) == NULL) { maip->base.status = MAD_STATUS_SA_REQ_INVALID_GID; IB_LOG_VERBOSE_FMT_VF( vfp, "sa_McMemberRecord_Delete", - "Cound not find multicast GID of "FMT_GID" in list of active multicast GIDs," + "Could not find multicast GID of "FMT_GID" in list of active multicast GIDs," " for request from %s Port %d, PortGUID "FMT_U64", LID 0x%.8X", mcastGid[0], mcastGid[1], senderName, senderPort->index, senderGuid, maip->addrInfo.slid); @@ -1419,7 +1419,7 @@ sa_McMemberRecord_Delete(Topology_t *topop, Mai_t *maip, uint32_t *records) if ((mcMember = sm_find_multicast_member(mcGroup, mcmp->RID.PortGID)) == NULL) { maip->base.status = MAD_STATUS_SA_REQ_INVALID_GID; IB_LOG_VERBOSE_FMT_VF( vfp, "sa_McMemberRecord_Delete", - "Cound not find multicast member with port GID of "FMT_GID" in list " + "Could not find multicast member with port GID of "FMT_GID" in list " "for multicast group with GID "FMT_GID " for request from %s Port %d, PortGUID "FMT_U64", LID 0x%.8X", prefix, guid, mcastGid[0], mcastGid[1], senderName, senderPort->index, senderGuid, diff --git a/Esm/ib/src/smi/sa/sa_NodeRecord.c b/Esm/ib/src/smi/sa/sa_NodeRecord.c index c8875fb..78f6203 100644 --- a/Esm/ib/src/smi/sa/sa_NodeRecord.c +++ b/Esm/ib/src/smi/sa/sa_NodeRecord.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sa/sa_PathRecord.c b/Esm/ib/src/smi/sa/sa_PathRecord.c index 224e7b6..d03d892 100644 --- a/Esm/ib/src/smi/sa/sa_PathRecord.c +++ b/Esm/ib/src/smi/sa/sa_PathRecord.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sa/sa_PortInfoRecord.c b/Esm/ib/src/smi/sa/sa_PortInfoRecord.c index 9ec65c0..e14b819 100644 --- a/Esm/ib/src/smi/sa/sa_PortInfoRecord.c +++ b/Esm/ib/src/smi/sa/sa_PortInfoRecord.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sa/sa_QuarantinedNodeRecord.c b/Esm/ib/src/smi/sa/sa_QuarantinedNodeRecord.c index f5e3944..04ff501 100644 --- a/Esm/ib/src/smi/sa/sa_QuarantinedNodeRecord.c +++ b/Esm/ib/src/smi/sa/sa_QuarantinedNodeRecord.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sa/sa_SCSCTableRecord.c b/Esm/ib/src/smi/sa/sa_SCSCTableRecord.c index 2d3008c..aa5038b 100644 --- a/Esm/ib/src/smi/sa/sa_SCSCTableRecord.c +++ b/Esm/ib/src/smi/sa/sa_SCSCTableRecord.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -137,7 +137,7 @@ sa_SCSCTableRecord_Set(uint8_t *slp, Node_t *nodep, Port_t *in_portp, Port_t *ou } } else { IB_LOG_ERROR_FMT( "sa_SCSCTableRecord_Set", - "Invalid call for non-swith or port 0 for Node Guid["FMT_U64"], %s", + "Invalid call for non-switch or port 0 for Node Guid["FMT_U64"], %s", nodep->nodeInfo.NodeGUID, sm_nodeDescString(nodep)); IB_EXIT("sa_SCSCTableRecord_Set", VSTATUS_BAD); return(VSTATUS_BAD); diff --git a/Esm/ib/src/smi/sa/sa_SLSCTableRecord.c b/Esm/ib/src/smi/sa/sa_SLSCTableRecord.c index de6db9e..a2b4db6 100644 --- a/Esm/ib/src/smi/sa/sa_SLSCTableRecord.c +++ b/Esm/ib/src/smi/sa/sa_SLSCTableRecord.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sa/sa_TraceRecord.c b/Esm/ib/src/smi/sa/sa_TraceRecord.c index 28ddd0e..16dfe70 100644 --- a/Esm/ib/src/smi/sa/sa_TraceRecord.c +++ b/Esm/ib/src/smi/sa/sa_TraceRecord.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sa/sa_Trap.c b/Esm/ib/src/smi/sa/sa_Trap.c index ad5e223..a0f16c6 100644 --- a/Esm/ib/src/smi/sa/sa_Trap.c +++ b/Esm/ib/src/smi/sa/sa_Trap.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -548,7 +548,7 @@ sa_Trap(Mai_t *maip) { if (sm_config.IgnoreTraps) { // filter out all traps sm_get_lid_info(desc, notice.IssuerLID); - IB_LOG_WARN_FMT(__func__, "Dropping trap recieved from %s", desc); + IB_LOG_WARN_FMT(__func__, "Dropping trap received from %s", desc); /* * If it is a port state change or capabilitymask change, I must signal for a sweep */ diff --git a/Esm/ib/src/smi/sa/sa_VFabricRecord.c b/Esm/ib/src/smi/sa/sa_VFabricRecord.c index ce01051..f33eab8 100644 --- a/Esm/ib/src/smi/sa/sa_VFabricRecord.c +++ b/Esm/ib/src/smi/sa/sa_VFabricRecord.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sa/sa_m.h b/Esm/ib/src/smi/sa/sa_m.h index 7e6645b..0db2fdf 100644 --- a/Esm/ib/src/smi/sa/sa_m.h +++ b/Esm/ib/src/smi/sa/sa_m.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sa/sa_main.c b/Esm/ib/src/smi/sa/sa_main.c index 0ec0f01..ccf3017 100644 --- a/Esm/ib/src/smi/sa/sa_main.c +++ b/Esm/ib/src/smi/sa/sa_main.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sa/sa_userexits.c b/Esm/ib/src/smi/sa/sa_userexits.c index 771a306..41d6c72 100644 --- a/Esm/ib/src/smi/sa/sa_userexits.c +++ b/Esm/ib/src/smi/sa/sa_userexits.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -85,7 +85,7 @@ multipathrecord_userexit(uint8_t *data, uint32_t *records) { Status_t servicerecord_userexit(Mai_t *maip) { - IB_ENTER("servicerecord_usrexit", maip, 0, 0, 0); + IB_ENTER("servicerecord_userexit", maip, 0, 0, 0); IB_EXIT("servicerecord_userexit", VSTATUS_OK); return(VSTATUS_OK); diff --git a/Esm/ib/src/smi/sa/sa_utility.c b/Esm/ib/src/smi/sa/sa_utility.c index 47e33f7..42ee729 100644 --- a/Esm/ib/src/smi/sa/sa_utility.c +++ b/Esm/ib/src/smi/sa/sa_utility.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -1327,7 +1327,7 @@ sa_send_multi(Mai_t *maip, sa_cntxt_t *sa_cntxt ) { } if (chkSum != sa_cntxt->chkSum) { IB_LOG_ERROR_FMT(__func__, - "CHECKSUM FAILED [%d vs %d] for completeted %s[%s] RMPP TRANSACTION from LID[0x%x], TID["FMT_U64"]", + "CHECKSUM FAILED [%d vs %d] for completed %s[%s] RMPP TRANSACTION from LID[0x%x], TID["FMT_U64"]", chkSum, sa_cntxt->chkSum, sa_getMethodText((int)sa_cntxt->method), sa_getAidName(sa_cntxt->mad.base.aid), sa_cntxt->lid, sa_cntxt->tid); } diff --git a/Esm/ib/src/smi/sm/Makefile b/Esm/ib/src/smi/sm/Makefile index f13905e..c7b3a9a 100755 --- a/Esm/ib/src/smi/sm/Makefile +++ b/Esm/ib/src/smi/sm/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for SM Module diff --git a/Esm/ib/src/smi/sm/README b/Esm/ib/src/smi/sm/README index b24ad8a..92e211d 100644 --- a/Esm/ib/src/smi/sm/README +++ b/Esm/ib/src/smi/sm/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/src/smi/sm/sm_activate.c b/Esm/ib/src/smi/sm/sm_activate.c index 26a61b3..0c76ea3 100644 --- a/Esm/ib/src/smi/sm/sm_activate.c +++ b/Esm/ib/src/smi/sm/sm_activate.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_ar.c b/Esm/ib/src/smi/sm/sm_ar.c index 3490add..452b6a7 100644 --- a/Esm/ib/src/smi/sm/sm_ar.c +++ b/Esm/ib/src/smi/sm/sm_ar.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -211,8 +211,12 @@ sm_AdaptiveRoutingSwitchUpdate(ParallelSweepContext_t *psc, SmMaiHandle_t *fd, T // The # of blocks we can send in this MAD. Normally // sm_config.lft_multi_block but will be less for the last send. - numBlocks = ( currentLid + lids_per_mad <= pgftCap) ? sm_config.lft_multi_block : - 1 + (pgftCap - (currentLid+1))/NUM_PGFT_ELEMENTS_BLOCK; + if (currentLid + lids_per_mad <= pgftCap) { + numBlocks = sm_config.lft_multi_block; + } else { + numBlocks = (pgftCap - currentLid) / NUM_PGFT_ELEMENTS_BLOCK; + if ( (pgftCap - currentLid) % NUM_PGFT_ELEMENTS_BLOCK) numBlocks++; + } // AMOD = NNNN NNNN 0000 0ABB BBBB BBBB BBBB BBBB // AMOD = numBlocks 0000 00[[[[[[current set]]]]] amod = (numBlocks<<24) | currentSet; diff --git a/Esm/ib/src/smi/sm/sm_async.c b/Esm/ib/src/smi/sm/sm_async.c index fb33f93..5451d06 100644 --- a/Esm/ib/src/smi/sm/sm_async.c +++ b/Esm/ib/src/smi/sm/sm_async.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_attribute.c b/Esm/ib/src/smi/sm/sm_attribute.c index 676af8c..17b3f0c 100644 --- a/Esm/ib/src/smi/sm/sm_attribute.c +++ b/Esm/ib/src/smi/sm/sm_attribute.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_buffer_control_tables.c b/Esm/ib/src/smi/sm/sm_buffer_control_tables.c index 0c38137..e4ac466 100644 --- a/Esm/ib/src/smi/sm/sm_buffer_control_tables.c +++ b/Esm/ib/src/smi/sm/sm_buffer_control_tables.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_cable_info.c b/Esm/ib/src/smi/sm/sm_cable_info.c index 2262cbe..77d35a2 100644 --- a/Esm/ib/src/smi/sm/sm_cable_info.c +++ b/Esm/ib/src/smi/sm/sm_cable_info.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_congestion.c b/Esm/ib/src/smi/sm/sm_congestion.c index e8422f6..78f372d 100644 --- a/Esm/ib/src/smi/sm/sm_congestion.c +++ b/Esm/ib/src/smi/sm/sm_congestion.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_control.c b/Esm/ib/src/smi/sm/sm_control.c index 9f8008c..2d8ba58 100644 --- a/Esm/ib/src/smi/sm/sm_control.c +++ b/Esm/ib/src/smi/sm/sm_control.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_counters.c b/Esm/ib/src/smi/sm/sm_counters.c index ab3d532..c1ae5bb 100644 --- a/Esm/ib/src/smi/sm/sm_counters.c +++ b/Esm/ib/src/smi/sm/sm_counters.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -91,7 +91,7 @@ sm_counter_t smCounters[smCountersMax] = { [smCounterTrapRePath] = { "SM RX TRAP(RePath)", 0, 0, 0 }, [smCounterTrapPortStateChg] = { "SM RX TRAP(PortStateChg)", 0, 0, 0 }, [smCounterTrapLinkIntegrity] = { "SM RX TRAP(LinkIntegrity)", 0, 0, 0 }, - [smCounterTrapBufOverrun] = { "SM RX TRAP(BufferOverun)", 0, 0, 0 }, + [smCounterTrapBufOverrun] = { "SM RX TRAP(BufferOverrun)", 0, 0, 0 }, [smCounterTrapFlowControl] = { "SM RX TRAP(FlowControl)", 0, 0, 0 }, [smCounterTrapLocalChg] = { "SM RX TRAP(LocalChange)", 0, 0, 0 }, [smCounterTrapSysImgChg] = { "SM RX TRAP(SysImageChg)", 0, 0, 0 }, diff --git a/Esm/ib/src/smi/sm/sm_dbsync.c b/Esm/ib/src/smi/sm/sm_dbsync.c index e7745cf..a6aa6b2 100644 --- a/Esm/ib/src/smi/sm/sm_dbsync.c +++ b/Esm/ib/src/smi/sm/sm_dbsync.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -384,7 +384,7 @@ static Status_t dbsync_getSMDBCCCSync(SMSyncReq_t *syncReqp) { if ((status = dbSyncCmdToMgr(dbsyncfd_if3, DBSYNC_AID_SYNC, DBSYNC_AMOD_GET_CCC, NULL, 0, msgbuf, &len, &resp_status)) != VSTATUS_OK) { IB_LOG_INFO_FMT(__func__, - "get of stanby SM at portGuid "FMT_U64", LID=[0x%x] Failed (rc=%d)", + "get of standby SM at portGuid "FMT_U64", LID=[0x%x] Failed (rc=%d)", syncReqp->portguid, syncReqp->standbyLid, status); } else if (len <= 0) { status=VSTATUS_BAD; @@ -784,7 +784,7 @@ static Status_t dbsync_setSMDBInform(SMSyncReq_t *syncReqp) { } else { /* successfully sync'd all INFORM records to standby SM */ IB_LOG_INFO_FMT(__func__, - "Full sync of %d INFORM records to SM at portGuid "FMT_U64", LID=[0x%x] was successfull", + "Full sync of %d INFORM records to SM at portGuid "FMT_U64", LID=[0x%x] was successful", numRecs, syncReqp->portguid, syncReqp->standbyLid); } } @@ -848,7 +848,7 @@ static Status_t dbsync_updateSMDBInform(SMSyncReq_t *syncReqp) { } else { /* successfully sync'd all INFORM records to standby SM */ IB_LOG_INFO_FMT(__func__, - "%s of INFORM record to SM at portGuid "FMT_U64", LID=[0x%x] was successfull", + "%s of INFORM record to SM at portGuid "FMT_U64", LID=[0x%x] was successful", ((syncReqp->type == DBSYNC_TYPE_UPDATE) ? "UPDATE":"DELETE"), syncReqp->portguid, syncReqp->standbyLid); } } @@ -1144,7 +1144,7 @@ static Status_t dbsync_setSMDBGroup(SMSyncReq_t *syncReqp) { } else { /* successfully sync'd all INFORM records to standby SM */ IB_LOG_INFO_FMT(__func__, - "Full sync of %d GROUP records to SM at portGuid "FMT_U64", LID=[0x%x] was successfull", + "Full sync of %d GROUP records to SM at portGuid "FMT_U64", LID=[0x%x] was successful", grpcnt, syncReqp->portguid, syncReqp->standbyLid); } } @@ -1260,7 +1260,7 @@ static Status_t dbsync_updateSMDBGroup(SMSyncReq_t *syncReqp) { } else { /* successfully sync'd all INFORM records to standby SM */ IB_LOG_INFO_FMT(__func__, - "%s of GROUP record to SM at portGuid "FMT_U64", LID=[0x%x] was successfull", + "%s of GROUP record to SM at portGuid "FMT_U64", LID=[0x%x] was successful", ((syncReqp->type == DBSYNC_TYPE_UPDATE) ? "UPDATE":"DELETE"), syncReqp->portguid, syncReqp->standbyLid); } } @@ -1568,7 +1568,7 @@ static Status_t dbsync_setSMDBService(SMSyncReq_t *syncReqp) { } else { /* successfully sync'd all INFORM records to standby SM */ IB_LOG_INFO_FMT(__func__, - "Full sync of %d SERVICE records with SM at portGuid "FMT_U64", LID=[0x%x] was successfull", + "Full sync of %d SERVICE records with SM at portGuid "FMT_U64", LID=[0x%x] was successful", numRecs, syncReqp->portguid, syncReqp->standbyLid); } } @@ -1625,7 +1625,7 @@ static Status_t dbsync_updateSMDBService(SMSyncReq_t *syncReqp) { } else { /* successfully sync'd all INFORM records to standby SM */ IB_LOG_INFO_FMT(__func__, - "%s of SERVICE record to SM at portGuid "FMT_U64", LID=[0x%x] was successfull", + "%s of SERVICE record to SM at portGuid "FMT_U64", LID=[0x%x] was successful", ((syncReqp->type == DBSYNC_TYPE_UPDATE) ? "UPDATE":"DELETE"), syncReqp->portguid, syncReqp->standbyLid); } } @@ -1887,7 +1887,7 @@ static Status_t dbsync_setSMDBMCRoot(SMSyncReq_t *syncReqp) { } else { /* successfully sync'd to standby SM */ IB_LOG_INFO_FMT(__func__, - "Full sync of MC ROOT GUID "FMT_U64" with SM at portGuid "FMT_U64", LID=[0x%x] was successfull", + "Full sync of MC ROOT GUID "FMT_U64" with SM at portGuid "FMT_U64", LID=[0x%x] was successful", sm_mcSpanningTreeRootGuid, syncReqp->portguid, syncReqp->standbyLid); } } @@ -2355,7 +2355,7 @@ static void dbsync_procReqQ(void) { /* * sm_dbsync main function - * processes requests off the dbsync queue when in master mode, sending sync messages to stanby SMs + * processes requests off the dbsync queue when in master mode, sending sync messages to standby SMs * processes sync messages from master when in standby mode */ void sm_dbsync(uint32_t argc, uint8_t ** argv) { diff --git a/Esm/ib/src/smi/sm/sm_dbsync_util.c b/Esm/ib/src/smi/sm/sm_dbsync_util.c index e8abed0..c2b8e9a 100644 --- a/Esm/ib/src/smi/sm/sm_dbsync_util.c +++ b/Esm/ib/src/smi/sm/sm_dbsync_util.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_dgrouting.c b/Esm/ib/src/smi/sm/sm_dgrouting.c index 0c81b92..7181dab 100644 --- a/Esm/ib/src/smi/sm/sm_dgrouting.c +++ b/Esm/ib/src/smi/sm/sm_dgrouting.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_diag_ctrl.c b/Esm/ib/src/smi/sm/sm_diag_ctrl.c index 551cd27..312f750 100644 --- a/Esm/ib/src/smi/sm/sm_diag_ctrl.c +++ b/Esm/ib/src/smi/sm/sm_diag_ctrl.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_discovery.c b/Esm/ib/src/smi/sm/sm_discovery.c index f7b07af..b39531b 100644 --- a/Esm/ib/src/smi/sm/sm_discovery.c +++ b/Esm/ib/src/smi/sm/sm_discovery.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -411,7 +411,7 @@ _validate_predef_fields(Topology_t* topop, FabricData_t* pdtop, Node_t * upstrea if (hitCnt > 1 && (pdtCfg->logMessageThreshold == 0 || forcePrint || topop->preDefLogCounts.totalLogCount < pdtCfg->logMessageThreshold)) { - IB_LOG_WARN_FMT(__func__, "Mutlitple expected links matched by node" + IB_LOG_WARN_FMT(__func__, "Multiple expected links matched by node" " desc and port number. NodeGUID: "FMT_U64", NodeDesc: %s," " PortNum: %d", upstreamNodep->nodeInfo.NodeGUID, sm_nodeDescString(upstreamNodep), upstreamPortp->index); diff --git a/Esm/ib/src/smi/sm/sm_dispatch.c b/Esm/ib/src/smi/sm/sm_dispatch.c index cddd2cf..2520e2c 100644 --- a/Esm/ib/src/smi/sm/sm_dispatch.c +++ b/Esm/ib/src/smi/sm/sm_dispatch.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_dor.c b/Esm/ib/src/smi/sm/sm_dor.c index 83425ab..3336122 100644 --- a/Esm/ib/src/smi/sm/sm_dor.c +++ b/Esm/ib/src/smi/sm/sm_dor.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -3468,7 +3468,7 @@ _process_xml_config(void) if (sm_config.smDorRouting.warn_threshold > SM_DOR_MAX_WARN_THRESHOLD) { IB_LOG_WARN_FMT(__func__, - "MeshTorusTopology WarnThreshold of %d is higher than max suported %d. Defaulting to %d.", + "MeshTorusTopology WarnThreshold of %d is higher than max supported %d. Defaulting to %d.", sm_config.smDorRouting.warn_threshold, SM_DOR_MAX_WARN_THRESHOLD, SM_DOR_MAX_WARN_THRESHOLD); sm_config.smDorRouting.warn_threshold = SM_DOR_MAX_WARN_THRESHOLD; } diff --git a/Esm/ib/src/smi/sm/sm_fattree.c b/Esm/ib/src/smi/sm/sm_fattree.c index f34f437..4648519 100644 --- a/Esm/ib/src/smi/sm/sm_fattree.c +++ b/Esm/ib/src/smi/sm/sm_fattree.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_flapping.c b/Esm/ib/src/smi/sm/sm_flapping.c index 26815ef..c2a1b8d 100644 --- a/Esm/ib/src/smi/sm/sm_flapping.c +++ b/Esm/ib/src/smi/sm/sm_flapping.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_fsm.c b/Esm/ib/src/smi/sm/sm_fsm.c index b3b8403..dccbace 100644 --- a/Esm/ib/src/smi/sm/sm_fsm.c +++ b/Esm/ib/src/smi/sm/sm_fsm.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -653,7 +653,7 @@ sm_fsm_master(Mai_t *maip, char *nodename) sm_getStateText(sm_smInfo.u.s.SMStateCurrent), sm_getStateText(theirSmInfo.u.s.SMStateCurrent), nodename, slid, theirSmInfo.PortGUID); } else { IB_LOG_INFINI_INFO_FMT(__func__, - "[%s] SM successfully acknowleded Handover from remote SM node %s, LID [0x%x], portguid ["FMT_U64"]", + "[%s] SM successfully acknowledged Handover from remote SM node %s, LID [0x%x], portguid ["FMT_U64"]", sm_getStateText(sm_smInfo.u.s.SMStateCurrent), nodename, slid, theirSmInfo.PortGUID); } /* make transition to MASTER state */ diff --git a/Esm/ib/src/smi/sm/sm_hypercube.c b/Esm/ib/src/smi/sm/sm_hypercube.c index 4a23d83..36f16bc 100644 --- a/Esm/ib/src/smi/sm/sm_hypercube.c +++ b/Esm/ib/src/smi/sm/sm_hypercube.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_lid_assignment.c b/Esm/ib/src/smi/sm/sm_lid_assignment.c index 414340c..a74bb9b 100644 --- a/Esm/ib/src/smi/sm/sm_lid_assignment.c +++ b/Esm/ib/src/smi/sm/sm_lid_assignment.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_linux.c b/Esm/ib/src/smi/sm/sm_linux.c index 26c29b0..bbc88da 100644 --- a/Esm/ib/src/smi/sm/sm_linux.c +++ b/Esm/ib/src/smi/sm/sm_linux.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_linux_proc.c b/Esm/ib/src/smi/sm/sm_linux_proc.c index 2d90f6b..d4e378f 100644 --- a/Esm/ib/src/smi/sm/sm_linux_proc.c +++ b/Esm/ib/src/smi/sm/sm_linux_proc.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_main.c b/Esm/ib/src/smi/sm/sm_main.c index 0f34e78..2f9c2c0 100644 --- a/Esm/ib/src/smi/sm/sm_main.c +++ b/Esm/ib/src/smi/sm/sm_main.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -422,7 +422,7 @@ void sm_init_plt_table(void){ sa_dynamicPlt[6], sa_dynamicPlt[7], sa_dynamicPlt[8], sa_dynamicPlt[9]); vs_log_output_message(msgbuf, FALSE); } else { - sprintf(msgbuf, "SM: Dynamic packet lifetime is OFF, using saPacketLifetime contant %d", (unsigned int)sm_config.sa_packet_lifetime_n2); + sprintf(msgbuf, "SM: Dynamic packet lifetime is OFF, using saPacketLifetime constant %d", (unsigned int)sm_config.sa_packet_lifetime_n2); vs_log_output_message(msgbuf, FALSE); } return; @@ -2471,7 +2471,7 @@ smProcessReconfigureRequest(void){ } } else { - IB_LOG_ERROR0("SM: Error processing reconfigure request; reRenderVirtaulFabricsConfig failed"); + IB_LOG_ERROR0("SM: Error processing reconfigure request; reRenderVirtualFabricsConfig failed"); } } diff --git a/Esm/ib/src/smi/sm/sm_mkey.c b/Esm/ib/src/smi/sm/sm_mkey.c index aa46e00..72cc4cb 100644 --- a/Esm/ib/src/smi/sm/sm_mkey.c +++ b/Esm/ib/src/smi/sm/sm_mkey.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_multicast.c b/Esm/ib/src/smi/sm/sm_multicast.c index 5975c0b..e1b8af4 100644 --- a/Esm/ib/src/smi/sm/sm_multicast.c +++ b/Esm/ib/src/smi/sm/sm_multicast.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_parallelsweep.c b/Esm/ib/src/smi/sm/sm_parallelsweep.c index 5b7defb..3142bb6 100644 --- a/Esm/ib/src/smi/sm/sm_parallelsweep.c +++ b/Esm/ib/src/smi/sm/sm_parallelsweep.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_partMgr.c b/Esm/ib/src/smi/sm/sm_partMgr.c index 01c40ca..07fcbb2 100644 --- a/Esm/ib/src/smi/sm/sm_partMgr.c +++ b/Esm/ib/src/smi/sm/sm_partMgr.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_pkeys.c b/Esm/ib/src/smi/sm/sm_pkeys.c index be3797d..f54ca8f 100644 --- a/Esm/ib/src/smi/sm/sm_pkeys.c +++ b/Esm/ib/src/smi/sm/sm_pkeys.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_popo.c b/Esm/ib/src/smi/sm/sm_popo.c index 97728c6..7479c9e 100644 --- a/Esm/ib/src/smi/sm/sm_popo.c +++ b/Esm/ib/src/smi/sm/sm_popo.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_qos.c b/Esm/ib/src/smi/sm/sm_qos.c index 63a094c..1a499bb 100644 --- a/Esm/ib/src/smi/sm/sm_qos.c +++ b/Esm/ib/src/smi/sm/sm_qos.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_routing.c b/Esm/ib/src/smi/sm/sm_routing.c index 652918a..dc5e166 100644 --- a/Esm/ib/src/smi/sm/sm_routing.c +++ b/Esm/ib/src/smi/sm/sm_routing.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_routing_funcs.c b/Esm/ib/src/smi/sm/sm_routing_funcs.c index 0c9d4c6..bf12230 100644 --- a/Esm/ib/src/smi/sm/sm_routing_funcs.c +++ b/Esm/ib/src/smi/sm/sm_routing_funcs.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_switch_info.c b/Esm/ib/src/smi/sm/sm_switch_info.c index 8d7d9c5..8e70aa8 100644 --- a/Esm/ib/src/smi/sm/sm_switch_info.c +++ b/Esm/ib/src/smi/sm/sm_switch_info.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_topology.c b/Esm/ib/src/smi/sm/sm_topology.c index c4178ee..42f271d 100644 --- a/Esm/ib/src/smi/sm/sm_topology.c +++ b/Esm/ib/src/smi/sm/sm_topology.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -193,7 +193,7 @@ static const char *sweep_reasons[] = { [SM_SWEEP_REASON_FAILED_SWEEP] = "Problems during previous sweep, retrying.", [SM_SWEEP_REASON_TRAP_EVENT] = "Trap event occurred that requires re-sweep.", [SM_SWEEP_REASON_UNQUARANTINE] = "Last sweep succeeded with quarantined devices: clearing short-term quarantine and retrying.", - [SM_SWEEP_REASON_UNDETERMINED] = "No reason was specified (WARNING: abormal!)." + [SM_SWEEP_REASON_UNDETERMINED] = "No reason was specified (WARNING: abnormal!)." }; SweepReason_t sm_resweep_reason = SM_SWEEP_REASON_INIT; @@ -1104,7 +1104,7 @@ verify_admin_membership(Port_t *portp) vfp->full_member[dg].member); } } else { - IB_LOG_ERROR_FMT(__func__,"Unabled to validate SM's membership in Admin VF."); + IB_LOG_ERROR_FMT(__func__,"Unable to validate SM's membership in Admin VF."); } done: @@ -1320,6 +1320,13 @@ unlock_bail: if (status != VSTATUS_OK) IB_FATAL_ERROR_NODUMP("Failed to release old topology lock"); + if (sm_state == SM_STATE_DISCOVERING) { + // Local port connection to neighbor switch (root switch) disrupted for some reason. + // LFTs might be incomplete (especially if the root switch is an unmanaged switch that was rebooted), + // so indicate that a fabric change has been detected to ensure update of LFTs. + topology_changed = 1; + } + status = sm_setup_local_node(sm_topop, &preDefTopology); if (status != VSTATUS_OK) { IB_ERROR_NOREPEAT(lastMsg,15, "Can't set up my local node, sleeping rc: %u", status); diff --git a/Esm/ib/src/smi/sm/sm_topology_rcv.c b/Esm/ib/src/smi/sm/sm_topology_rcv.c index c15db4e..5cdc38b 100644 --- a/Esm/ib/src/smi/sm/sm_topology_rcv.c +++ b/Esm/ib/src/smi/sm/sm_topology_rcv.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_update_fields.c b/Esm/ib/src/smi/sm/sm_update_fields.c index a88d20a..e5cce89 100644 --- a/Esm/ib/src/smi/sm/sm_update_fields.c +++ b/Esm/ib/src/smi/sm/sm_update_fields.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_userexits.c b/Esm/ib/src/smi/sm/sm_userexits.c index 6503268..a0b7c27 100644 --- a/Esm/ib/src/smi/sm/sm_userexits.c +++ b/Esm/ib/src/smi/sm/sm_userexits.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/sm_utility.c b/Esm/ib/src/smi/sm/sm_utility.c index 3f0abcf..a98f20c 100644 --- a/Esm/ib/src/smi/sm/sm_utility.c +++ b/Esm/ib/src/smi/sm/sm_utility.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -2379,8 +2379,6 @@ sm_initialize_port(ParallelSweepContext_t *psc, SmMaiHandle_t *fd, Topology_t * needSet = 1; } - } else { - portInfo.FlitControl.Interleave.s.DistanceEnabled = STL_PORT_FLIT_DISTANCE_MODE_NONE; } if (portp->portData->portInfo.PortMode.s.IsVLMarkerEnabled != @@ -2486,7 +2484,14 @@ sm_initialize_port(ParallelSweepContext_t *psc, SmMaiHandle_t *fd, Topology_t * if (portInfo.s4.OperationalVL != portp->portData->vl1) { portInfo.s4.OperationalVL = portp->portData->vl1; /* JSY - interop fix */ - needSet = 1; + // Workaround for WFR Driver Bug: + // Driver does not retain the OperationalVL field value configured by the SM. This causes + // the SM to issue a Set PortInfo on every sweep. + // The workaround is to set the OperationalVL field at least once, and ignore all other + // discrepancies between the OperationalVL and vl1 fields. + if (nodep->nodeInfo.NodeType != NI_TYPE_CA || portp->state == IB_PORT_INIT) { + needSet = 1; + } } else { portInfo.s4.OperationalVL = 0; } @@ -2577,24 +2582,26 @@ sm_initialize_port(ParallelSweepContext_t *psc, SmMaiHandle_t *fd, Topology_t * needSet = 1; } - /* check pkey enforcement on switch linked to FI */ - if (enforcePkey) { - if (!portInfo.s3.PartitionEnforcementInbound) { - portInfo.s3.PartitionEnforcementInbound = 1; - needSet = 1; - } - if (!portInfo.s3.PartitionEnforcementOutbound) { - portInfo.s3.PartitionEnforcementOutbound = 1; - needSet = 1; - } - } else { - if (portInfo.s3.PartitionEnforcementInbound) { - portInfo.s3.PartitionEnforcementInbound = 0; - needSet = 1; - } - if (portInfo.s3.PartitionEnforcementOutbound) { - portInfo.s3.PartitionEnforcementOutbound = 0; - needSet = 1; + /* check pkey enforcement on switch external ports, N/A for HFIs and switch port 0 */ + if (nodep->nodeInfo.NodeType == NI_TYPE_SWITCH && portp->index > 0) { + if (enforcePkey) { + if (!portInfo.s3.PartitionEnforcementInbound) { + portInfo.s3.PartitionEnforcementInbound = 1; + needSet = 1; + } + if (!portInfo.s3.PartitionEnforcementOutbound) { + portInfo.s3.PartitionEnforcementOutbound = 1; + needSet = 1; + } + } else { + if (portInfo.s3.PartitionEnforcementInbound) { + portInfo.s3.PartitionEnforcementInbound = 0; + needSet = 1; + } + if (portInfo.s3.PartitionEnforcementOutbound) { + portInfo.s3.PartitionEnforcementOutbound = 0; + needSet = 1; + } } } diff --git a/Esm/ib/src/smi/sm/sm_utility_hft.c b/Esm/ib/src/smi/sm/sm_utility_hft.c index 1a72e5e..ea06b16 100755 --- a/Esm/ib/src/smi/sm/sm_utility_hft.c +++ b/Esm/ib/src/smi/sm/sm_utility_hft.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/src/smi/sm/stl_cca.c b/Esm/ib/src/smi/sm/stl_cca.c index 0aeec17..cf6ed35 100644 --- a/Esm/ib/src/smi/sm/stl_cca.c +++ b/Esm/ib/src/smi/sm/stl_cca.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Esm/ib/test/README b/Esm/ib/test/README index 37bc6e5..7c0be53 100644 --- a/Esm/ib/test/README +++ b/Esm/ib/test/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/test/cs/README b/Esm/ib/test/cs/README index 6e3563b..74318ec 100644 --- a/Esm/ib/test/cs/README +++ b/Esm/ib/test/cs/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/test/linux/README b/Esm/ib/test/linux/README index ee65cba..78e33a0 100644 --- a/Esm/ib/test/linux/README +++ b/Esm/ib/test/linux/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/test/linux/cs/usr/Makefile b/Esm/ib/test/linux/cs/usr/Makefile index a3264cf..40b18b2 100755 --- a/Esm/ib/test/linux/cs/usr/Makefile +++ b/Esm/ib/test/linux/cs/usr/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for SM Module diff --git a/Esm/ib/test/linux/cs/usr/README b/Esm/ib/test/linux/cs/usr/README index 375bfed..cc791b8 100644 --- a/Esm/ib/test/linux/cs/usr/README +++ b/Esm/ib/test/linux/cs/usr/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/test/linux/usr/Makefile b/Esm/ib/test/linux/usr/Makefile index 299a137..3b011b0 100755 --- a/Esm/ib/test/linux/usr/Makefile +++ b/Esm/ib/test/linux/usr/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for SM Module diff --git a/Esm/ib/test/linux/usr/cs/Makefile b/Esm/ib/test/linux/usr/cs/Makefile index 208f971..80fc725 100755 --- a/Esm/ib/test/linux/usr/cs/Makefile +++ b/Esm/ib/test/linux/usr/cs/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for SM Module diff --git a/Esm/ib/test/mai/README b/Esm/ib/test/mai/README index 22f4861..1b4e3b3 100644 --- a/Esm/ib/test/mai/README +++ b/Esm/ib/test/mai/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/test/mai/filter/Makefile b/Esm/ib/test/mai/filter/Makefile index 9897b88..012bb9c 100755 --- a/Esm/ib/test/mai/filter/Makefile +++ b/Esm/ib/test/mai/filter/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for SM Module diff --git a/Esm/ib/test/mai/filter/README b/Esm/ib/test/mai/filter/README index 8666eb2..2280b55 100644 --- a/Esm/ib/test/mai/filter/README +++ b/Esm/ib/test/mai/filter/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/test/mai/handles/Makefile b/Esm/ib/test/mai/handles/Makefile index ab29093..4815d08 100755 --- a/Esm/ib/test/mai/handles/Makefile +++ b/Esm/ib/test/mai/handles/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for SM Module diff --git a/Esm/ib/test/mai/handles/README b/Esm/ib/test/mai/handles/README index b8f9339..63c8d6a 100644 --- a/Esm/ib/test/mai/handles/README +++ b/Esm/ib/test/mai/handles/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/test/mai/open/Makefile b/Esm/ib/test/mai/open/Makefile index 0022028..9476058 100755 --- a/Esm/ib/test/mai/open/Makefile +++ b/Esm/ib/test/mai/open/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for SM Module diff --git a/Esm/ib/test/mai/open/README b/Esm/ib/test/mai/open/README index 006522c..4db439a 100644 --- a/Esm/ib/test/mai/open/README +++ b/Esm/ib/test/mai/open/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/test/mai/perf/Makefile b/Esm/ib/test/mai/perf/Makefile index d998e1a..886c2fc 100755 --- a/Esm/ib/test/mai/perf/Makefile +++ b/Esm/ib/test/mai/perf/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for SM Module diff --git a/Esm/ib/test/mai/perf/README b/Esm/ib/test/mai/perf/README index b3e3a69..d4de355 100644 --- a/Esm/ib/test/mai/perf/README +++ b/Esm/ib/test/mai/perf/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/test/mai/qp0/Makefile b/Esm/ib/test/mai/qp0/Makefile index ee020cb..b736084 100755 --- a/Esm/ib/test/mai/qp0/Makefile +++ b/Esm/ib/test/mai/qp0/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for SM Module diff --git a/Esm/ib/test/mai/qp0/README b/Esm/ib/test/mai/qp0/README index 8cd1804..47e5bd5 100644 --- a/Esm/ib/test/mai/qp0/README +++ b/Esm/ib/test/mai/qp0/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/test/smi/Makefile b/Esm/ib/test/smi/Makefile index 21a4684..fcb8a49 100755 --- a/Esm/ib/test/smi/Makefile +++ b/Esm/ib/test/smi/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for SM Module diff --git a/Esm/ib/test/smi/README b/Esm/ib/test/smi/README index 77869ee..01831ff 100644 --- a/Esm/ib/test/smi/README +++ b/Esm/ib/test/smi/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/ib/test/smi/sm/Makefile b/Esm/ib/test/smi/sm/Makefile index adc0e86..c08e3cb 100755 --- a/Esm/ib/test/smi/sm/Makefile +++ b/Esm/ib/test/smi/sm/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for SM Module diff --git a/Esm/ib/test/smi/sm/README b/Esm/ib/test/smi/sm/README index 199f73d..a0550a7 100644 --- a/Esm/ib/test/smi/sm/README +++ b/Esm/ib/test/smi/sm/README @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT10 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/Esm/rpm_runmake b/Esm/rpm_runmake index 99e9464..3f7383e 100755 --- a/Esm/rpm_runmake +++ b/Esm/rpm_runmake @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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 **************************************** ## ## rpm_runmake @@ -173,7 +173,7 @@ make $clobber_arg stage echo "Done $BUILD_TARGET_OS $BUILD_TARGET HSM $SUBPRODUCT $(date)" echo "==============================================================" -echo "Preping Files for $BUILD_TARGET_OS $BUILD_TARGET $(date)..." +echo "Prepping Files for $BUILD_TARGET_OS $BUILD_TARGET $(date)..." # run prep and package once at end # TBD - move package into outer final_package step and remove from here # consolidate Makefile accordingly to have one package target diff --git a/Esm/runmake b/Esm/runmake index d80b94d..4068c18 100755 --- a/Esm/runmake +++ b/Esm/runmake @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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 **************************************** ## ## runmake diff --git a/Esm/setenv b/Esm/setenv index 5fb917b..ad8326e 100755 --- a/Esm/setenv +++ b/Esm/setenv @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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 **************************************** # Simple script to setup environment for a build for current OS version/type diff --git a/Esm/update_opa-fm_spec.sh b/Esm/update_opa-fm_spec.sh index a923bac..f054d25 100755 --- a/Esm/update_opa-fm_spec.sh +++ b/Esm/update_opa-fm_spec.sh @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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 **************************************** id=$(./Esm/get_id_and_versionid.sh | cut -f1 -d' ') @@ -45,7 +45,7 @@ then cp $from $to fi -sed -i "s/__RPM_FS/OPA_FEATURE_SET=$OPA_FEATURE_SET/g" $to +sed -i "s/__RPM_FS/OPA_FEATURE_SET=opa10/g" $to if [ "$id" = "rhel" -o "$id" = "centos" ] then @@ -70,7 +70,9 @@ then sed -i "s/__RPM_SYSCONF/%{_sysconfdir}\/init.d\/opafm/g" $to fi sed -i "s/__RPM_RQ2/Requires: libibumad%{?_isa}, libibverbs%{?_isa}, rdma, expat%{?_isa}, libhfi1, openssl%{?_isa}/g" $to - sed -i "/__RPM_DEBUG/,+1d" $to + sed -i "/__RPM_RQ3/,+1d" $to + sed -i "/__RPM_BLDRQ3/d" $to + sed -i "/__RPM_DEBUG/d" $to elif [ "$id" = "sles" ] then GE_11_1=$(echo "$versionid >= 11.1" | bc) @@ -98,6 +100,8 @@ then fi sed -i "/__RPM_INS/,+1d" $to sed -i "/__RPM_SYSCONF/,+1d" $to + sed -i "/__RPM_RQ3/d" $to + sed -i "/__RPM_BLDRQ3/d" $to sed -i "s/__RPM_RQ2/Requires: libibumad3, libibverbs1, rdma, libexpat1, openssl/g" $to elif [ "$id" = "fedora" ] then @@ -106,6 +110,8 @@ then sed -i "s/__RPM_RQ1/Requires: systemd %{?systemd_requires}/g" $to sed -i "/__RPM_SYSCONF/,+1d" $to sed -i "s/__RPM_RQ2/Requires: libibumad%{?_isa}, libibverbs%{?_isa}, rdma, expat%{?_isa}, libhfi1, openssl%{?_isa}/g" $to + sed -i "/__RPM_RQ3/d" $to + sed -i "/__RPM_BLDRQ3/d" $to sed -i "/__RPM_DEBUG/,+1d" $to else echo ERROR: Unsupported distribution: $id $versionid diff --git a/Esm/update_opa-fm_spec.sh.base b/Esm/update_opa-fm_spec.sh.base index a923bac..fc4b3eb 100755 --- a/Esm/update_opa-fm_spec.sh.base +++ b/Esm/update_opa-fm_spec.sh.base @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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 **************************************** id=$(./Esm/get_id_and_versionid.sh | cut -f1 -d' ') @@ -45,7 +45,7 @@ then cp $from $to fi -sed -i "s/__RPM_FS/OPA_FEATURE_SET=$OPA_FEATURE_SET/g" $to +sed -i "s/__RPM_FS/OPA_FEATURE_SET=opa10/g" $to if [ "$id" = "rhel" -o "$id" = "centos" ] then diff --git a/IbAccess/Common/Ibt/Cm/cm_active.c b/IbAccess/Common/Ibt/Cm/cm_active.c index 296278e..51e3165 100644 --- a/IbAccess/Common/Ibt/Cm/cm_active.c +++ b/IbAccess/Common/Ibt/Cm/cm_active.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT4 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -9,7 +9,7 @@ modification, are permitted provided that the following conditions are met: 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. + 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. @@ -315,7 +315,7 @@ Connect( DEBUG_ASSERT(pCEP->pDgrmElement->Element.pBufferList->ByteCount == MAD_BLOCK_SIZE); if (pCEP->pDgrmElement->Element.pBufferList->ByteCount != MAD_BLOCK_SIZE) { - _DBG_ERROR((" Disgarding Corrupt Datagram!!! pDgrmElement = %p, pCEP->pDgrmElement->Element.pBufferList = %p, pCEP->pDgrmElement->Element.pBufferList->ByteCount = %d\n", + _DBG_ERROR((" Discarding Corrupt Datagram!!! pDgrmElement = %p, pCEP->pDgrmElement->Element.pBufferList = %p, pCEP->pDgrmElement->Element.pBufferList->ByteCount = %d\n", _DBG_PTR(pCEP), _DBG_PTR(pCEP->pDgrmElement), _DBG_PTR(pCEP->pDgrmElement->Element.pBufferList), diff --git a/IbAccess/Common/Ibt/Vca/ibt_utils.c b/IbAccess/Common/Ibt/Vca/ibt_utils.c index 818d3db..359644c 100644 --- a/IbAccess/Common/Ibt/Vca/ibt_utils.c +++ b/IbAccess/Common/Ibt/Vca/ibt_utils.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT6 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -1034,7 +1034,7 @@ const char* iba_event_record_msg(IB_EVENT_RECORD *p_event) switch (p_event->EventType) { default: - return "Uknown Event"; + return "Unknown Event"; break; case AsyncEventPathMigrated: return "QP Path Migrated"; diff --git a/IbAccess/Common/Inc/ib_helper.h b/IbAccess/Common/Inc/ib_helper.h index 98b6fc8..4c673f7 100644 --- a/IbAccess/Common/Inc/ib_helper.h +++ b/IbAccess/Common/Inc/ib_helper.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT3 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/IbAccess/Common/Inc/ib_sd.h b/IbAccess/Common/Inc/ib_sd.h index 84061a9..53b0136 100644 --- a/IbAccess/Common/Inc/ib_sd.h +++ b/IbAccess/Common/Inc/ib_sd.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT3 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/IbAccess/Common/Inc/stl_helper.h b/IbAccess/Common/Inc/stl_helper.h index 04309e9..c67aa87 100644 --- a/IbAccess/Common/Inc/stl_helper.h +++ b/IbAccess/Common/Inc/stl_helper.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/IbAccess/Common/Inc/stl_pa_priv.h b/IbAccess/Common/Inc/stl_pa_priv.h index 86fcfb6..2f40a28 100644 --- a/IbAccess/Common/Inc/stl_pa_priv.h +++ b/IbAccess/Common/Inc/stl_pa_priv.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/IbAccess/Common/Inc/stl_pa_types.h b/IbAccess/Common/Inc/stl_pa_types.h index 8619c5c..6b18db4 100644 --- a/IbAccess/Common/Inc/stl_pa_types.h +++ b/IbAccess/Common/Inc/stl_pa_types.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/IbAccess/Common/Inc/stl_pkt.h b/IbAccess/Common/Inc/stl_pkt.h index c7bd29a..8d51160 100644 --- a/IbAccess/Common/Inc/stl_pkt.h +++ b/IbAccess/Common/Inc/stl_pkt.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/IbAccess/Common/Inc/stl_pm.h b/IbAccess/Common/Inc/stl_pm.h index 33be6cd..479e274 100644 --- a/IbAccess/Common/Inc/stl_pm.h +++ b/IbAccess/Common/Inc/stl_pm.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/IbAccess/Common/Inc/stl_sa_priv.h b/IbAccess/Common/Inc/stl_sa_priv.h index 02bd76a..68e7a69 100644 --- a/IbAccess/Common/Inc/stl_sa_priv.h +++ b/IbAccess/Common/Inc/stl_sa_priv.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/IbAccess/Common/Inc/stl_sa_types.h b/IbAccess/Common/Inc/stl_sa_types.h index 9e24d1b..8ed9a90 100644 --- a/IbAccess/Common/Inc/stl_sa_types.h +++ b/IbAccess/Common/Inc/stl_sa_types.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/IbAccess/Common/Inc/stl_sd.h b/IbAccess/Common/Inc/stl_sd.h index 1c6d541..ba3dc6f 100644 --- a/IbAccess/Common/Inc/stl_sd.h +++ b/IbAccess/Common/Inc/stl_sd.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/IbAccess/Common/Inc/stl_sm_priv.h b/IbAccess/Common/Inc/stl_sm_priv.h index 466c69d..ea05fff 100644 --- a/IbAccess/Common/Inc/stl_sm_priv.h +++ b/IbAccess/Common/Inc/stl_sm_priv.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/IbAccess/Common/Inc/stl_sm_types.h b/IbAccess/Common/Inc/stl_sm_types.h index 143fb07..2b7670b 100644 --- a/IbAccess/Common/Inc/stl_sm_types.h +++ b/IbAccess/Common/Inc/stl_sm_types.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/IbAccess/Common/Inc/stl_types.h b/IbAccess/Common/Inc/stl_types.h index 2731c6a..87ff1d7 100644 --- a/IbAccess/Common/Inc/stl_types.h +++ b/IbAccess/Common/Inc/stl_types.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT3 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/IbAccess/Common/Inc/umadt.h b/IbAccess/Common/Inc/umadt.h index 1154f94..e67bab5 100644 --- a/IbAccess/Common/Inc/umadt.h +++ b/IbAccess/Common/Inc/umadt.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/IbAccess/Common/Public/ibyteswap.h b/IbAccess/Common/Public/ibyteswap.h index f9bebbb..1e97fc2 100644 --- a/IbAccess/Common/Public/ibyteswap.h +++ b/IbAccess/Common/Public/ibyteswap.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT3 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -2093,7 +2093,7 @@ static __inline void StoreU64(uint8* addr, uint64 value) vartype field2; \ vartype field1; #else -#error "Uknown Byte order, neither CPU_LE nor CPU_BE set" +#error "Unknown Byte order, neither CPU_LE nor CPU_BE set" #endif /* CPU_LE */ #ifdef __cplusplus diff --git a/IbAccess/Common/Public/ievent.h b/IbAccess/Common/Public/ievent.h index 2b6ee51..5c53ed2 100644 --- a/IbAccess/Common/Public/ievent.h +++ b/IbAccess/Common/Public/ievent.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT3 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -9,7 +9,7 @@ modification, are permitted provided that the following conditions are met: 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. + 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. diff --git a/IbAccess/Common/Public/iheapmanager.c b/IbAccess/Common/Public/iheapmanager.c index 418b39f..38f3fd6 100644 --- a/IbAccess/Common/Public/iheapmanager.c +++ b/IbAccess/Common/Public/iheapmanager.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT4 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -9,7 +9,7 @@ modification, are permitted provided that the following conditions are met: 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. + 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. @@ -239,7 +239,7 @@ static FSTATUS HeapManagerSplitBucket(HEAP_MANAGER *heap_mng,uint32 log2_size) LIST_ITEM *item; #if HEAP_MANAGER_DEBUG - MsgOut("Out of Free memory for heap(%s), need to rearange\n", + MsgOut("Out of Free memory for heap(%s), need to rearrange\n", heap_mng->name); #endif // split the bucket with the most free diff --git a/IbAccess/Common/Public/imemory.c b/IbAccess/Common/Public/imemory.c index b5951cb..492f87f 100644 --- a/IbAccess/Common/Public/imemory.c +++ b/IbAccess/Common/Public/imemory.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT6 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/IbAccess/Common/Public/imemory.h b/IbAccess/Common/Public/imemory.h index 5bdd18c..d3d831f 100644 --- a/IbAccess/Common/Public/imemory.h +++ b/IbAccess/Common/Public/imemory.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT3 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/IbAccess/Common/Public/iquickmap.c b/IbAccess/Common/Public/iquickmap.c index 80c81ec..19c8a71 100644 --- a/IbAccess/Common/Public/iquickmap.c +++ b/IbAccess/Common/Public/iquickmap.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT6 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -9,7 +9,7 @@ modification, are permitted provided that the following conditions are met: 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. + 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. diff --git a/IbAccess/Common/Public/iquickmap.h b/IbAccess/Common/Public/iquickmap.h index 29bff98..6358f55 100644 --- a/IbAccess/Common/Public/iquickmap.h +++ b/IbAccess/Common/Public/iquickmap.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT3 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -9,7 +9,7 @@ modification, are permitted provided that the following conditions are met: 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. + 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. diff --git a/IbAccess/Common/Public/ithread.h b/IbAccess/Common/Public/ithread.h index 8819014..adcfa96 100644 --- a/IbAccess/Common/Public/ithread.h +++ b/IbAccess/Common/Public/ithread.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT3 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -9,7 +9,7 @@ modification, are permitted provided that the following conditions are met: 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. + 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. diff --git a/IbAccess/Common/Public/ithreadpool.c b/IbAccess/Common/Public/ithreadpool.c index ed7b5d2..c9061eb 100644 --- a/IbAccess/Common/Public/ithreadpool.c +++ b/IbAccess/Common/Public/ithreadpool.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT6 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -9,7 +9,7 @@ modification, are permitted provided that the following conditions are met: 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. + 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. diff --git a/IbAccess/Common/Public/ithreadpool.h b/IbAccess/Common/Public/ithreadpool.h index 5b4fa8e..387de17 100644 --- a/IbAccess/Common/Public/ithreadpool.h +++ b/IbAccess/Common/Public/ithreadpool.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT3 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -9,7 +9,7 @@ modification, are permitted provided that the following conditions are met: 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. + 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. diff --git a/IbAccess/Common/SubnetDriver/query.c b/IbAccess/Common/SubnetDriver/query.c index ae577ac..81984fc 100644 --- a/IbAccess/Common/SubnetDriver/query.c +++ b/IbAccess/Common/SubnetDriver/query.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT4 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -201,7 +201,7 @@ InitializeList( QListInitState(*ppList); if (!QListInit(*ppList)) { - _DBG_ERROR(("Cannot intialize query list, exiting\n")); + _DBG_ERROR(("Cannot initialize query list, exiting\n")); Fstatus = FERROR; goto faillist; } diff --git a/IbAccess/Common/SubnetDriver/sa.c b/IbAccess/Common/SubnetDriver/sa.c index 3652214..93cbf74 100644 --- a/IbAccess/Common/SubnetDriver/sa.c +++ b/IbAccess/Common/SubnetDriver/sa.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT4 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -445,7 +445,7 @@ SubnetAdmRecv( { IBT_ELEMENT *pElement; - _DBG_DUMP_MEMORY(_DBG_LVL_ERROR, ("Coalesed"), (void*)buffer, messageSize); + _DBG_DUMP_MEMORY(_DBG_LVL_ERROR, ("Coalesced"), (void*)buffer, messageSize); for (i=0,pElement = &pDgrmList->Element; pElement; i++,pElement=pElement->pNextElement) { diff --git a/IbAccess/Common/SubnetDriver/sdc.c b/IbAccess/Common/SubnetDriver/sdc.c index 03e3e0f..360b7b4 100644 --- a/IbAccess/Common/SubnetDriver/sdc.c +++ b/IbAccess/Common/SubnetDriver/sdc.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT4 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -9,7 +9,7 @@ modification, are permitted provided that the following conditions are met: 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. + 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. @@ -456,7 +456,7 @@ TimerHandler( } if(pQueryElement->RetriesLeft > 0) { //Retry it - _DBG_WARN (("Timeout has occured on a Query! \n")); + _DBG_WARN (("Timeout has occurred on a Query! \n")); _DBG_INFO(("Retrying a QueryElement Retries Left = %d\n", pQueryElement->RetriesLeft)); --(pQueryElement->RetriesLeft); @@ -464,7 +464,7 @@ TimerHandler( StartTimer = TRUE; index++; } else { - _DBG_WARN (("Timeout has occured on a Query, Retries Exhausted! \n")); + _DBG_WARN (("Timeout has occurred on a Query, Retries Exhausted! \n")); if(pQueryElement->IsSelfCommand != TRUE) { // RecvHandler calls ScheduleCompletionProcessing as needed @@ -487,7 +487,7 @@ TimerHandler( AtomicDecrementVoid(&Outstanding); ASSERT(pQueryElement->RetriesLeft > 0); //Retry it - _DBG_WARN (("SA Busy has occured on a Query! \n")); + _DBG_WARN (("SA Busy has occurred on a Query! \n")); _DBG_INFO(("Retrying a QueryElement Retries Left = %d\n", pQueryElement->RetriesLeft)); --(pQueryElement->RetriesLeft); diff --git a/IbAccess/Common/SubnetDriver/sdsend.c b/IbAccess/Common/SubnetDriver/sdsend.c index 4225c21..a01d6f4 100644 --- a/IbAccess/Common/SubnetDriver/sdsend.c +++ b/IbAccess/Common/SubnetDriver/sdsend.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT4 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -9,7 +9,7 @@ modification, are permitted provided that the following conditions are met: 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. + 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. @@ -98,7 +98,7 @@ SendQueryElement( #endif if (Status != FSUCCESS) { - _DBG_WARN(("Failed to allocate SA DGRM, Status = <%d>, exitting\n", Status)); + _DBG_WARN(("Failed to allocate SA DGRM, Status = <%d>, exiting\n", Status)); // we will try again later AtomicDecrementVoid(&Outstanding); pQueryElement->QState = ReadyToSend; diff --git a/IbAccess/UserLinux/Public/Makefile b/IbAccess/UserLinux/Public/Makefile index 9687b59..c6e671c 100644 --- a/IbAccess/UserLinux/Public/Makefile +++ b/IbAccess/UserLinux/Public/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for public diff --git a/IbAccess/UserLinux/Public/ievent.c b/IbAccess/UserLinux/Public/ievent.c index cda11f5..05c2e50 100644 --- a/IbAccess/UserLinux/Public/ievent.c +++ b/IbAccess/UserLinux/Public/ievent.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -9,7 +9,7 @@ modification, are permitted provided that the following conditions are met: 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. + 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. diff --git a/IbAccess/UserLinux/Public/ithread.c b/IbAccess/UserLinux/Public/ithread.c index b30299d..7c99f9e 100644 --- a/IbAccess/UserLinux/Public/ithread.c +++ b/IbAccess/UserLinux/Public/ithread.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -9,7 +9,7 @@ modification, are permitted provided that the following conditions are met: 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. + 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. diff --git a/IbPrint/sa.c b/IbPrint/sa.c index d3d7c59..d5bb131 100644 --- a/IbPrint/sa.c +++ b/IbPrint/sa.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -304,7 +304,7 @@ void PrintInformInfo(PrintDest_t *dest, int indent, const IB_INFORM_INFO *pInfor if (pInformInfo->IsGeneric) { char buf[8]; - PrintFunc(dest, "%*s%sSubcribe: Type: %8s Generic: Trap: %5d QPN: 0x%06x\n", + PrintFunc(dest, "%*s%sSubscribe: Type: %8s Generic: Trap: %5d QPN: 0x%06x\n", indent, "", pInformInfo->Subscribe?"":"Un", IbNoticeTypeToText(pInformInfo->Type), @@ -317,7 +317,7 @@ void PrintInformInfo(PrintDest_t *dest, int indent, const IB_INFORM_INFO *pInfor } else { char buf[8]; FormatTimeoutMult(buf, pInformInfo->u.Generic.u2.s.RespTimeValue); - PrintFunc(dest, "%*s%sSubcribe: Type: %8s VendorId: 0x%04x DeviceId: 0x%04x QPN: 0x%06x\n", + PrintFunc(dest, "%*s%sSubscribe: Type: %8s VendorId: 0x%04x DeviceId: 0x%04x QPN: 0x%06x\n", indent, "", pInformInfo->Subscribe?"":"Un", IbNoticeTypeToText(pInformInfo->Type), diff --git a/IbPrint/sd.c b/IbPrint/sd.c index ddbd8ad..3164f90 100644 --- a/IbPrint/sd.c +++ b/IbPrint/sd.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/IbPrint/stl_pa.c b/IbPrint/stl_pa.c index e2bc5e5..57c8ddb 100644 --- a/IbPrint/stl_pa.c +++ b/IbPrint/stl_pa.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/IbPrint/stl_pm.c b/IbPrint/stl_pm.c index e6e4839..1d9f21b 100644 --- a/IbPrint/stl_pm.c +++ b/IbPrint/stl_pm.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/IbPrint/stl_print.h b/IbPrint/stl_print.h index 6c0cdee..6906fd6 100644 --- a/IbPrint/stl_print.h +++ b/IbPrint/stl_print.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/IbPrint/stl_sa.c b/IbPrint/stl_sa.c index 7c81695..84e474d 100644 --- a/IbPrint/stl_sa.c +++ b/IbPrint/stl_sa.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/IbPrint/stl_sma.c b/IbPrint/stl_sma.c index cac8cae..f6c0013 100644 --- a/IbPrint/stl_sma.c +++ b/IbPrint/stl_sma.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -1706,7 +1706,7 @@ void PrintStlInformInfo(PrintDest_t *dest, int indent, if (pInformInfo->IsGeneric) { char buf[8]; - PrintFunc(dest, "%*s%sSubcribe: Type: %8s Generic: Trap: %5d " + PrintFunc(dest, "%*s%sSubscribe: Type: %8s Generic: Trap: %5d " "QPN: 0x%06x\n", indent, "", pInformInfo->Subscribe?"":"Un", @@ -1720,7 +1720,7 @@ void PrintStlInformInfo(PrintDest_t *dest, int indent, } else { char buf[8]; FormatTimeoutMult(buf, pInformInfo->u.Generic.u1.s.RespTimeValue); - PrintFunc(dest, "%*s%sSubcribe: Type: %8s VendorId: 0x%04x DeviceId: 0x%04x QPN: 0x%06x\n", + PrintFunc(dest, "%*s%sSubscribe: Type: %8s VendorId: 0x%04x DeviceId: 0x%04x QPN: 0x%06x\n", indent, "", pInformInfo->Subscribe?"":"Un", IbNoticeTypeToText(pInformInfo->Type), diff --git a/IbaTools/FastFabric/Makefile b/IbaTools/FastFabric/Makefile index 8ff38fc..f4b6ec9 100644 --- a/IbaTools/FastFabric/Makefile +++ b/IbaTools/FastFabric/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for cluster_tools diff --git a/IbaTools/FastFabric/opacablehealthcron.sh b/IbaTools/FastFabric/opacablehealthcron.sh index f8b3297..3d40793 100755 --- a/IbaTools/FastFabric/opacablehealthcron.sh +++ b/IbaTools/FastFabric/opacablehealthcron.sh @@ -1,7 +1,7 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** # -# Copyright (c) 2015-2018, Intel Corporation +# Copyright (c) 2015-2020, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/IbaTools/FastFabric/opafastfabric.pl b/IbaTools/FastFabric/opafastfabric.pl index 65819f7..a400f44 100755 --- a/IbaTools/FastFabric/opafastfabric.pl +++ b/IbaTools/FastFabric/opafastfabric.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/IbaTools/FastFabric/opasetupssh.sh b/IbaTools/FastFabric/opasetupssh.sh index 35c93a4..dd940ac 100755 --- a/IbaTools/FastFabric/opasetupssh.sh +++ b/IbaTools/FastFabric/opasetupssh.sh @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/IbaTools/FastFabric/opaswdisableall.sh b/IbaTools/FastFabric/opaswdisableall.sh index d7ebad4..02e2490 100755 --- a/IbaTools/FastFabric/opaswdisableall.sh +++ b/IbaTools/FastFabric/opaswdisableall.sh @@ -1,7 +1,7 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** # -# Copyright (c) 2018, Intel Corporation +# Copyright (c) 2015-2020, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: diff --git a/IbaTools/FastFabric/opatest.sh b/IbaTools/FastFabric/opatest.sh index 057c117..b7f71d9 100755 --- a/IbaTools/FastFabric/opatest.sh +++ b/IbaTools/FastFabric/opatest.sh @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/IbaTools/FastFabric/opauploadall.sh b/IbaTools/FastFabric/opauploadall.sh index ae9bda6..8e40bd7 100755 --- a/IbaTools/FastFabric/opauploadall.sh +++ b/IbaTools/FastFabric/opauploadall.sh @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/IbaTools/FastFabric/restampFirmwares.sh b/IbaTools/FastFabric/restampFirmwares.sh index 8c1ec19..ee3eda7 100755 --- a/IbaTools/FastFabric/restampFirmwares.sh +++ b/IbaTools/FastFabric/restampFirmwares.sh @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/IbaTools/Makefile b/IbaTools/Makefile index 3289866..330dff9 100644 --- a/IbaTools/Makefile +++ b/IbaTools/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for IbaTools diff --git a/IbaTools/opaxmlextract/Makefile b/IbaTools/opaxmlextract/Makefile index c1ada61..3fc9506 100644 --- a/IbaTools/opaxmlextract/Makefile +++ b/IbaTools/opaxmlextract/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for opaxmlextract diff --git a/IbaTools/opaxmlextract/opaextractlink.sh b/IbaTools/opaxmlextract/opaextractlink.sh index 9b6e769..2eea031 100755 --- a/IbaTools/opaxmlextract/opaextractlink.sh +++ b/IbaTools/opaxmlextract/opaextractlink.sh @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] @@ -34,6 +34,10 @@ # Extract optional cable values, and values for both ports of each link # Remove redundant information and combine cable and port information +tempfile="$(mktemp)" +trap "rm -f $tempfile; exit 1" SIGHUP SIGTERM SIGINT +trap "rm -f $tempfile" EXIT + Usage_full() { cmd=`basename $0` @@ -63,12 +67,12 @@ Usage_full() echo "See the man page for \"opareport\" for the full set of options." >&2 echo "By design, the tool ignores \"-o/--output\" report option." >&2 echo >&2 - exit 0 } if [[ "$1" == "--help" ]] then Usage_full + exit 0 fi # opareport -o links generates XML output of this general form: @@ -107,6 +111,14 @@ function genReport() prevLinkID="" tempresults="" + /usr/sbin/opareport -x -Q -o links "$@" -d 3 > $tempfile + if [ ! -s $tempfile ] + then + echo "opaextractlink: Unable to get links report" >&2 + Usage_full + exit 1 + fi + while read line do curLinkID=`echo $line | cut -d \; -f 1` @@ -183,7 +195,7 @@ function genReport() tempresults=$RateStr";"$LinkDetailsStr";"$CableValuesStr";"$CableInfoValuesStr";"$Port1ValuesStr";"$Port2ValuesStr fi fi - done < <(/usr/sbin/opareport -x -Q -o links "$@" -d 3 | \ + done < <(cat $tempfile | \ /usr/sbin/opaxmlextract -H -d \; -e Link:id -e Rate -e LinkDetails -e CableLength \ -e CableLabel -e CableDetails -e DeviceTechShort -e CableInfo.Length \ -e CableInfo.VendorName -e CableInfo.VendorPN -e CableInfo.VendorRev \ diff --git a/IbaTools/opaxmlextract/opaextractperf2.sh b/IbaTools/opaxmlextract/opaextractperf2.sh index bfefc4b..dcb6765 100755 --- a/IbaTools/opaxmlextract/opaextractperf2.sh +++ b/IbaTools/opaxmlextract/opaextractperf2.sh @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2019, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/IbaTools/opaxmlextract/opaextractstat.sh b/IbaTools/opaxmlextract/opaextractstat.sh index 405374f..64198d0 100755 --- a/IbaTools/opaxmlextract/opaextractstat.sh +++ b/IbaTools/opaxmlextract/opaextractstat.sh @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/IbaTools/opaxmlextract/opaextractstat2.sh b/IbaTools/opaxmlextract/opaextractstat2.sh index bdf8b4c..51c470b 100755 --- a/IbaTools/opaxmlextract/opaextractstat2.sh +++ b/IbaTools/opaxmlextract/opaextractstat2.sh @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2018, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/IbaTools/opaxmlextract/opamergeperf2.sh b/IbaTools/opaxmlextract/opamergeperf2.sh index 0ec0bbc..a1557f2 100755 --- a/IbaTools/opaxmlextract/opamergeperf2.sh +++ b/IbaTools/opaxmlextract/opamergeperf2.sh @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2019, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/IbaTools/opaxmlextract/opaxmlextract.c b/IbaTools/opaxmlextract/opaxmlextract.c index d8373d6..c6e8833 100644 --- a/IbaTools/opaxmlextract/opaxmlextract.c +++ b/IbaTools/opaxmlextract/opaxmlextract.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/IbaTools/opaxmlfilter/opaxmlfilter.c b/IbaTools/opaxmlfilter/opaxmlfilter.c index 3142306..ede9d69 100644 --- a/IbaTools/opaxmlfilter/opaxmlfilter.c +++ b/IbaTools/opaxmlfilter/opaxmlfilter.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -137,6 +137,12 @@ static void FieldXmlParserEnd(IXmlParserState_t *input_state, const IXML_FIELD * if (white && ! g_keep_newline && hasNewline) { // no real content, but has a newline, probably an empty list // no output here, and EndTag will be on a fresh line + } else if (white && g_keep_newline && hasNewline && len) { + // no real content, but has a newline (need to keep them) + // output here, trimmed from trailing spaces, + // EndTag will be on a last line with indent + len = IXmlTrimTrailingSpaces(content,len); + IXmlOutputPrintStrNewlineContent(output_state, content); } else if (len) { // tag had content, output it with appropriate XML escapes for // special characters diff --git a/MakeTemplates/Makerules.module b/MakeTemplates/Makerules.module index 8603561..b45907b 100755 --- a/MakeTemplates/Makerules.module +++ b/MakeTemplates/Makerules.module @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** ## Rules for module #=============================================================================# diff --git a/MakeTools/Makefile b/MakeTools/Makefile index 9682763..f9f2b9d 100644 --- a/MakeTools/Makefile +++ b/MakeTools/Makefile @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # Makefile for MakeTools diff --git a/MakeTools/format_releasetag.sh b/MakeTools/format_releasetag.sh index 3f978d0..bfefeda 100755 --- a/MakeTools/format_releasetag.sh +++ b/MakeTools/format_releasetag.sh @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2019, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/MakeTools/funcs-ext.sh b/MakeTools/funcs-ext.sh index 9aa4cd2..e0d584e 100755 --- a/MakeTools/funcs-ext.sh +++ b/MakeTools/funcs-ext.sh @@ -1,11 +1,11 @@ #!/bin/bash -v # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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 **************************************** # Override default funcs.sh functions from $ICSBIN. @@ -719,6 +719,9 @@ function os_vendor() sles) rval=SuSE ;; + sle_hpc) + rval=SuSE + ;; centos) rval=redhat ;; diff --git a/MakeTools/get_comp.sh b/MakeTools/get_comp.sh index f671ec0..fea09df 100644 --- a/MakeTools/get_comp.sh +++ b/MakeTools/get_comp.sh @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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 **************************************** ## ## get_comp @@ -102,7 +102,7 @@ shift 3 # See documentation above. export FTPSERVER=${FTPSERVER:-"ftp:ftp@kop-sds-ftp"} export SCPTOP=${SCPTOP:-"/nfs/site/proj/stlbuilds"} -export SCPSERVER=${SCPSERVER:-"phcvs2@phlsvlogin02"}:$SCPTOP +export SCPSERVER=${SCPSERVER:-"phcvs2@awylogin01.aw.intel.com"}:$SCPTOP # ftp_get_files is defined in newer versions of devtools if ! type ftp_get_files > /dev/null 2>/dev/null diff --git a/MakeTools/make_src_tar.sh b/MakeTools/make_src_tar.sh index 69edf55..0130fc5 100755 --- a/MakeTools/make_src_tar.sh +++ b/MakeTools/make_src_tar.sh @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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] diff --git a/MakeTools/patch_version/patch_version.c b/MakeTools/patch_version/patch_version.c index 52181ad..6592b94 100755 --- a/MakeTools/patch_version/patch_version.c +++ b/MakeTools/patch_version/patch_version.c @@ -7,7 +7,7 @@ */ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/MakeTools/prep.sh b/MakeTools/prep.sh index e7f4c86..8aa4f3b 100755 --- a/MakeTools/prep.sh +++ b/MakeTools/prep.sh @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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] diff --git a/MakeTools/rm_version/rm_version.c b/MakeTools/rm_version/rm_version.c index cc99c60..5c914dc 100755 --- a/MakeTools/rm_version/rm_version.c +++ b/MakeTools/rm_version/rm_version.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -9,7 +9,7 @@ modification, are permitted provided that the following conditions are met: 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. + 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. diff --git a/MakeTools/setenv b/MakeTools/setenv index e3a2c1b..249882d 100755 --- a/MakeTools/setenv +++ b/MakeTools/setenv @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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 **************************************** # Simple script to setup environment for a build for current OS version/type @@ -50,7 +50,8 @@ else export BUILD_TARGET_OS_VERSION=${BUILD_TARGET_OS_VERSION:-`uname -r`} if [ ${BUILD_TARGET_OS_VERSION:0:3} = '2.6' -o \ ${BUILD_TARGET_OS_VERSION:0:2} = '3.' -o \ - ${BUILD_TARGET_OS_VERSION:0:2} = '4.' ] + ${BUILD_TARGET_OS_VERSION:0:2} = '4.' -o \ + ${BUILD_TARGET_OS_VERSION:0:2} = '5.' ] then export BUILD_26=1 else diff --git a/MakeTools/unifdef2.sh b/MakeTools/unifdef2.sh index 05cf084..2c06a3c 100755 --- a/MakeTools/unifdef2.sh +++ b/MakeTools/unifdef2.sh @@ -5,65 +5,242 @@ # unifdef2.sh script # # Arguments: -# featureset-tag - this names the feature set and is used to identify sections -# in the in-file to be considered in the out-file # in-file - the input file. The file must contain at least one instance of -# "ifdef " and "endif " bracketing some text +# "ifdef " and "endif " bracketing some text # out-file - the output file to be written after applying the filtering # # unifdef2.sh filters a file by including everything outside of ifdef-endif -# brackets, and including only lines inside ifdef-endif brackets with the -# given featureset tag. All other lines are filtered out. +# brackets, and including only lines inside ifdef-endif brackets comparing +# the flag settings to environment settings. All other lines are filtered out. +# Also support ifndef as well as "ifdef !" # # Syntax of ifdef-endif pairs: -# Bracketing lines is accomplished by using "#ifdef " and "#endif " +# Bracketing lines is accomplished by using "#ifdef " and "#endif" # lines starting in the first colunm. There must be a single space between -# the ifdef/endif keyword and the tag. The tag can be followed by whitespace -# and then optional commenting text. -# Tags can be made up of alphnumeric and underscore characters, for example, -# "opa10", "opa11_2", etc. -# Examples: -# #ifdef opa10 -# ".."#endif" +# that match environment settings. # ################################################################################### -check_tag_syntax() +# +# Functions for handling ifdefs-by-export-flag +# for buildFeatureDefs +# + +get_flags() +{ + local line="$1" + local flags=$(echo $line | cut -d' ' -f2-) + echo "$flags" +} + +evaluate_flags () +{ + local flags_good=1 + local flags="$1" + local op= + for flag in $flags + do + if [ "$flag" = "AND" ] + then + op="and" + continue + elif [ "$flag" = "OR" ] + then + op="or" + continue + else + if ! echo $flag | grep "=" > /dev/null + then + echo syntax error + exit 1 + fi + fi + f=$(echo $flag | cut -d= -f1) + flagval=$(echo $flag | cut -d= -f2) + flag_env_val=${!f} + if [ "$flag_env_val" = "" ] + then + # flag not set in env, assume zero + flag_env_val=0 + fi + if [ "$flagval" = "$flag_env_val" ] + then + this_flag_good=1 + else + this_flag_good=0 + fi + if [ "$op" = "or" ] + then + flags_good=$(($flags_good | $this_flag_good)) + elif [ "$op" = "and" ] + then + flags_good=$(($flags_good & $this_flag_good)) + else + # first flag will not have "op" set, so just set it to this_glag_good + flags_good=$this_flag_good + fi + done + echo $flags_good +} +setup_env() +{ + # Import OPA Build feature settings. + export OPA_FEATURE_SET=${OPA_FEATURE_SET:-$(cat $TL_DIR/$PROJ_FILE_DIR/DEFAULT_OPA_FEATURE_SET)} + FEATURE_SETTINGS_FILE=opa_feature_settings.${PRODUCT}.$BUILD_CONFIG + $TL_DIR/OpaBuildFeatureToggles/opa_build_import_feature_settings.sh + if [ -e ./$FEATURE_SETTINGS_FILE ]; then + . ./$FEATURE_SETTINGS_FILE + else + echo "$0: ERROR: OPA BUILD - $FEATURE_SETTINGS_FILE not found" >&2 + return 1 + fi +} + +check_flag_dependencies() { - ltag1=$1 - where="$2" - rest=${ltag1//[A-Za-z0-9_]} - if [ "$rest" != "" ] + # if A21 or APR_ASIC are set, APR must be set + + if [ "$OPA_FEATURE_ENABLE_FM_A21" = "1" -a "$OPA_FEATURE_ENABLE_APR" = "0" ] + then + echo "Error: OPA Feature Settings: OPA_FEATURE_ENABLE_FM_A21 cannot be 1 unless OPA_FEATURE_ENABLE_APR is 1" + exit 1 + fi + if [ "$OPA_FEATURE_ENABLE_FM_APR_ASIC" = "1" -a "$OPA_FEATURE_ENABLE_APR" = "0" ] then - echo ERROR: unifdef2.sh: invalid featureset \<$ltag1\> "$where" - echo featureset can only be alphanumeric and underscores - rm -f .greps .greps1 + echo "Error: OPA Feature Settings: OPA_FEATURE_ENABLE_FM_APR_ASIC cannot be 1 unless OPA_FEATURE_ENABLE_APR is 1" exit 1 fi } +# +# Functions for handling ifdefs-by-feature +# for all files other than buildFeatureDefs +# + +declare -a defines +declare -a undefs +declare -a ifdef_stack +stack_size=0 + +evaluate_flag_nofd() +{ + not=0 + + flag="$1" + if [[ $flag =~ ^! ]] + then + not=1 + flag=${flag:1} + fi + + flag_defined=-1 + for i in ${defines[@]} + do + if [ "$i" = "$flag" ] + then + flag_defined=1 + break + fi + done + if [ $flag_defined -lt 0 ] + then + for i in ${undefs[@]} + do + if [ "$i" = "$flag" ] + then + flag_defined=0 + break + fi + done + fi + if [ $flag_defined -lt 0 ] + then + echo ERROR: invalid flag $flag + exit 1 + fi + + if [ $not -eq 1 ] + then + flag_defined=$((1 - flag_defined)) + fi + + echo $flag_defined + +} + +push_flag() +{ + ifdef_stack[$stack_size]=$1 + stack_size=$((stack_size + 1)) +} + +pop_flag() +{ + stack_size=$((stack_size - 1)) + unset ifdef_stack[$stack_size] +} + +top_of_stack() +{ + last_index=$((stack_size - 1)) + if [ $last_index -ge 0 ] + then + echo ${ifdef_stack[$last_index]} + else + echo "" + fi +} + +get_flag_nofd() +{ + echo "$line" | cut -d' ' -f 2- +} + +evaluate_flag() +{ + if [ $featureDefs -eq 1 ] + then + flag_defined=$(evaluate_flags "$2") + else + flag_defined=$(evaluate_flag_nofd "$2") + fi + + if [ $1 = ifndef ] + then + flag_defined=$((1 - flag_defined)) + fi + echo $flag_defined +} + +get_flag() +{ + if [ $featureDefs -eq 1 ] + then + echo $(get_flags "$1") + else + echo $(get_flag_nofd "$1") + fi +} + # shut off globbing set -f -if [ $# -ne 3 ] +if [ $# -ne 2 ] then echo ERROR: unifdef2.sh: wrong number of arguments: $# - echo Usage: unifdef2.sh featureset-tag in-file out-file + echo Usage: unifdef2.sh in-file out-file exit 1 fi -featureset=$1 -in_file=$2 -out_file=$3 - -check_tag_syntax $featureset "on command line" +in_file=$1 +out_file=$2 # check existence of in_file @@ -78,66 +255,88 @@ fi if [ "$in_file" = "$out_file" ] then echo ERROR: unifdef2.sh: in-file must be different than out-file - echo Usage: unifdef2.sh featureset-tag in-file out-file + echo Usage: unifdef2.sh in-file out-file exit 1 fi +# if out_file is buildFeatureDefs, set featureDefs + +if echo $out_file | grep buildFeatureDefs > /dev/null +then + featureDefs=1 +else + featureDefs=0 +fi + + # parse for syntax - check ifdef and endif tags, ensure matching and no nesting # first extract all #ifdef and #endif directives to make it run faster # ... in the grep, record the line nu㏔ers as well, we will use in main loop below grep -n "^#ifdef .*" $in_file > .greps1 -grep -n "^#endif .*" $in_file >> .greps1 +grep -n "^#ifndef .*" $in_file >> .greps1 +grep -n "^#else" $in_file >> .greps1 +grep -n "^#endif" $in_file >> .greps1 sort -g .greps1 > .greps # sort using line numbers with general-number-sort rm -f .greps1 # check for: # - mismatched ifdef-endif pairs +# - mismatched else +# - duplicate else +# - else before ifdef # - endif before ifdef # - nesting -outside_bracket=1 -save_tag= +inside_bracket=0 +in_else=0 while read line do - if [ $outside_bracket = 1 ] + if [ $inside_bracket -eq 0 ] then if echo $line | grep "#ifdef " > /dev/null then - save_tag=$(echo $line | cut -d' ' -f 2 | cut -f1) - check_tag_syntax $save_tag "in $in_file" - outside_bracket=0 - elif echo $line | grep "#endif " > /dev/null + inside_bracket=$((inside_bracket+1)) + in_else=0 + elif echo $line | grep "#ifndef " > /dev/null + then + inside_bracket=$((inside_bracket+1)) + in_else=0 + elif echo $line | grep "#else" > /dev/null then - save_tag=$(echo $line | cut -d' ' -f 2 | cut -f1) - check_tag_syntax $save_tag "in $in_file" - echo ERROR: unifdef2.sh: endif tag before ifdef for $save_tag in $in_file - exit 1 + echo ERROR: unifdef2.sh: else before ifdef/ifndef in $in_file + elif echo $line | grep "#endif" > /dev/null + then + echo ERROR: unifdef2.sh: endif before ifdef/ifndef in $in_file fi else # inside bracket - look for endif for this tag - if echo $line | grep "#endif $save_tag" > /dev/null - then - save_tag= - outside_bracket=1 - elif echo $line | grep "#ifdef " > /dev/null - then - save_tag2=$(echo $line | cut -d' ' -f 2 | cut -f1) - check_tag_syntax $save_tag2 "in $in_file" - echo ERROR: unifdef2.sh: ifdef tag for $save_tag2 before endif for $save_tag in $in_file - exit 1 - elif echo $line | grep "#endif " > /dev/null - then - save_tag2=$(echo $line | cut -d' ' -f 2 | cut -f1) - check_tag_syntax $save_tag2 "in $in_file" - echo ERROR: unifdef2.sh: endif tag for $save_tag2 inside bracket for $save_tag in $in_file - exit 1 + if echo $line | grep "#ifdef " > /dev/null + then + inside_bracket=$((inside_bracket+1)) + in_else=0 + elif echo $line | grep "#ifndef " > /dev/null + then + inside_bracket=$((inside_bracket+1)) + in_else=0 + elif echo $line | grep "#endif" > /dev/null + then + inside_bracket=$((inside_bracket-1)) + in_else=0 + elif echo $line | grep "#else" > /dev/null + then + if [ "$in_else" = "1" ] + then + echo ERROR: unifdef2.sh: duplicate else in $in_file + exit 1 + fi + in_else=1 fi fi done < .greps -if [ $outside_bracket = 0 ] +if [ $inside_bracket -gt 0 ] then - echo ERROR: unifdef2.sh: no endif for ifdef for $save_tag in $in_file + echo ERROR: unifdef2.sh: no endif for ifdef/ifndef in $in_file exit 1 fi @@ -151,12 +350,17 @@ fi # Loop through lines in in_file: # read a line # if the line number matches an ifdef/endif directive -# grab tag and directive from line +# grab flag and directive from line # if directive is ifdef -# if tag does not match featureset -# set writing to 0 (filter out this stuff) +# if flag is in defines +# set writing to 1 +# elif flag is in undefs +# set writing to 0 +# else +# exit bad flag +# elif directive is else # else (directive is endif) -# if tag does not match featureset +# if flags do not match # set writing to 1 (start writing again, "filter out" bracket is closed) # else (not a directive, just a normal line) # if writing is 1, write line to out_file @@ -166,27 +370,73 @@ fi > $out_file chmod --reference=$in_file $out_file # match permissions of in-file +# if doing featureDefs +# check flag dependencies and environment +# else +# load arrays + +if [ $featureDefs -eq 1 ] +then + if [ "$FLAGS_INITIALIZED" != "yes" ] + then + setup_env || exit 1 + fi + check_flag_dependencies +else + define_index=0 + undef_index=0 + while read line + do + if echo "$line" | grep "#define" > /dev/null + then + var=$(echo "$line" | cut -f2 -d# | cut -f2 -d' ') + defines[$define_index]=$var + define_index=$((define_index+1)) + fi + if echo "$line" | grep "#undef" > /dev/null + then + var=$(echo "$line" | cut -f2 -d# | cut -f2 -d' ') + undefs[$undef_index]=$var + undef_index=$((undef_index+1)) + fi + done < $TL_DIR/Fd/buildFeatureDefs +fi + writing=1 line_number=1 while IFS= read -r line do # is line_number in .greps? - if grep -w $line_number .greps > /dev/null + if grep -w ^$line_number .greps > /dev/null then - ltag=$(grep -w $line_number .greps|cut -f2 -d' '|cut -f1) - ldirective=$(grep -w $line_number .greps | cut -d' ' -f1 | cut -d# -f2) - if [ "$ldirective" = "ifdef" ] + flag=$(get_flag "$line") + ldirective=$(grep -w ^$line_number .greps | cut -d' ' -f1 | cut -d# -f2) + if [ "$ldirective" = "ifdef" -o "$ldirective" = "ifndef" ] then - if [ "$ltag" != "$featureset" ] + save_directive=$ldirective + push_flag "$flag" + flag_defined=$(evaluate_flag $ldirective "$flag") + if [ "$flag_defined" = "1" ] then + writing=1 + else writing=0 fi - else # it is endif - if [ "$ltag" != "$featureset" ] + elif [ "$ldirective" = "else" ] + then + top="$(top_of_stack)" + flag_defined=$(evaluate_flag $ldirective "$top") + if [ "$flag_defined" = "0" ] then writing=1 + else + writing=0 fi + else # it is endif + pop_flag + save_directive= + writing=1 fi elif [ $writing -eq 1 ] then diff --git a/MakeTools/unpack_comp.sh b/MakeTools/unpack_comp.sh index 2e6b2f6..5c1c158 100755 --- a/MakeTools/unpack_comp.sh +++ b/MakeTools/unpack_comp.sh @@ -1,11 +1,11 @@ #!/bin/bash # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -14,7 +14,7 @@ # * 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 @@ -25,7 +25,7 @@ # 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 **************************************** ## ## unpack_comp diff --git a/Makerules/Defs.Common b/Makerules/Defs.Common index d7745c2..4aa5e79 100755 --- a/Makerules/Defs.Common +++ b/Makerules/Defs.Common @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # some common settings which are platform independent diff --git a/Makerules/Defs.Flags b/Makerules/Defs.Flags index c4ceb27..e843243 100755 --- a/Makerules/Defs.Flags +++ b/Makerules/Defs.Flags @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # common flags for compiler/linker/tools diff --git a/Makerules/Maketargets.bsp b/Makerules/Maketargets.bsp index e7b93d8..f72b7fd 100755 --- a/Makerules/Maketargets.bsp +++ b/Makerules/Maketargets.bsp @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** #=============================================================================# # Rules: diff --git a/Makerules/Maketargets.product b/Makerules/Maketargets.product index fd06765..52dbcd8 100755 --- a/Makerules/Maketargets.product +++ b/Makerules/Maketargets.product @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** #=============================================================================# # Rules: diff --git a/Makerules/README b/Makerules/README index 246849e..e2644b6 100755 --- a/Makerules/README +++ b/Makerules/README @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # This directory contains makerules files. These files control the compiler and diff --git a/Makerules/Rules.Common b/Makerules/Rules.Common index 5c17e96..68465f1 100755 --- a/Makerules/Rules.Common +++ b/Makerules/Rules.Common @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015-2017, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** #=============================================================================# # @@ -447,9 +447,9 @@ endif # create file from base file using unifdef2.sh %: %.base - $(TL_DIR)/MakeTools/unifdef2.sh $(OPA_FEATURE_SET) $< $@ + $(TL_DIR)/MakeTools/unifdef2.sh $< $@ %.sh: %.sh.base - $(TL_DIR)/MakeTools/unifdef2.sh $(OPA_FEATURE_SET) $< $@ + $(TL_DIR)/MakeTools/unifdef2.sh $< $@ %.xlsx: %.xlsx.$(OPA_FEATURE_SET) cp $< $@ diff --git a/Makerules/Target.LINUX.GNU.X86_64 b/Makerules/Target.LINUX.GNU.X86_64 index 5a852b3..5c6127a 100755 --- a/Makerules/Target.LINUX.GNU.X86_64 +++ b/Makerules/Target.LINUX.GNU.X86_64 @@ -1,10 +1,10 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** -# -# Copyright (c) 2015, Intel Corporation -# +# +# Copyright (c) 2015-2020, Intel Corporation +# # 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 @@ -13,7 +13,7 @@ # * 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 @@ -24,7 +24,7 @@ # 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 **************************************** # suffixes and commands to build targets for: # BUILD_TARGET_OS=LINUX diff --git a/Topology/fabricdata.c b/Topology/fabricdata.c index c607cb0..f037d6f 100644 --- a/Topology/fabricdata.c +++ b/Topology/fabricdata.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Topology/focus.c b/Topology/focus.c index d992fdd..4a11c0a 100644 --- a/Topology/focus.c +++ b/Topology/focus.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -1704,9 +1704,60 @@ static FSTATUS ParseSmDetailsPatPoint(FabricData_t *fabricp, char *arg, Point *p return FindSmDetailsPatPoint(fabricp, arg, pPoint, find_flag); } +static FSTATUS ParseLinkCRCPoint(FabricData_t *fabricp, char *arg, Point *pPoint, uint8 find_flag, char **pp) +{ + LinkCRCCompare comp = CRC_EQ; + uint16 crc; + char *next; + + ASSERT(! PointValid(pPoint)); + *pp = arg; + if (NULL != (next = ComparePrefix(arg, "NE:"))) { + comp = CRC_NE; // not equal + } else if (NULL != (next = ComparePrefix(arg, ":"))) { + comp = CRC_EQ; // equal + } else { + fprintf(stderr, "%s: Invalid Link CRC format: '%s'\n", + g_Top_cmdname, arg); + return FINVALID_PARAMETER; + } + + *pp = next; + if (NULL != (next = ComparePrefix(*pp, "14b"))) { + *pp = next; + crc = STL_PORT_LTP_CRC_MODE_14; + } else if (NULL != (next = ComparePrefix(*pp, "14-bit"))) { + *pp = next; + crc = STL_PORT_LTP_CRC_MODE_14; + } else if (NULL != (next = ComparePrefix(*pp, "16b"))) { + *pp = next; + crc = STL_PORT_LTP_CRC_MODE_16; + } else if (NULL != (next = ComparePrefix(*pp, "16-bit"))) { + *pp = next; + crc = STL_PORT_LTP_CRC_MODE_16; + } else if (NULL != (next = ComparePrefix(*pp, "48b"))) { + *pp = next; + crc = STL_PORT_LTP_CRC_MODE_48; + } else if (NULL != (next = ComparePrefix(*pp, "48-bit"))) { + *pp = next; + crc = STL_PORT_LTP_CRC_MODE_48; + } else if (NULL != (next = ComparePrefix(*pp, "per_lane"))) { + *pp = next; + crc = STL_PORT_LTP_CRC_MODE_12_16_PER_LANE; + } else if (NULL != (next = ComparePrefix(*pp, "12-16/lane"))) { + *pp = next; + crc = STL_PORT_LTP_CRC_MODE_12_16_PER_LANE; + } else { + fprintf(stderr, "%s: Invalid Link CRC format: '%s'\n", g_Top_cmdname, arg); + return FINVALID_PARAMETER; + } + + return FindLinkCRCPoint(fabricp, crc, comp, pPoint, find_flag); +} + static FSTATUS ParseLinkQualityPoint(FabricData_t *fabricp, char *arg, Point *pPoint, uint8 find_flag, char **pp) { - LinkQualityCompare comp; + LinkQualityCompare comp = QUAL_EQ; uint16 quality; char *Quality; @@ -1748,7 +1799,7 @@ static FSTATUS ParseLinkDownReasonPoint(FabricData_t *fabricp, char *arg, Point if (NULL != (ldrp = ComparePrefix(arg, ":"))) { *pp = ldrp; if (FSUCCESS != StringToUint8(&ldr, ldrp, pp, 0, TRUE)) { - fprintf(stderr, "%s: Invalid Link Quality format: '%s'\n", g_Top_cmdname, arg); + fprintf(stderr, "%s: Invalid Link Down Reason format: '%s'\n", g_Top_cmdname, arg); return FINVALID_PARAMETER; } } @@ -1884,6 +1935,8 @@ FSTATUS ParsePoint(FabricData_t *fabricp, char* arg, Point* pPoint, uint8 find_f status = ParseSmDetailsPatPoint(fabricp, param, pPoint, find_flag, pp); } else if (NULL != (param = ComparePrefix(arg, "sm"))) { status = ParseSmPoint(fabricp, param, pPoint, find_flag, pp); + } else if (NULL != (param = ComparePrefix(arg, "linkcrc"))) { + status = ParseLinkCRCPoint(fabricp, param, pPoint, find_flag, pp); } else if (NULL != (param = ComparePrefix(arg, "linkqual"))) { status = ParseLinkQualityPoint(fabricp, param, pPoint, find_flag, pp); } else if (NULL != (param = ComparePrefix(arg, "ldr"))) { diff --git a/Topology/mad.c b/Topology/mad.c index 26cca67..5b35f8e 100644 --- a/Topology/mad.c +++ b/Topology/mad.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Topology/point.c b/Topology/point.c index 7012bb4..091167b 100644 --- a/Topology/point.c +++ b/Topology/point.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Topology/route.c b/Topology/route.c index e2d9f57..d3b0ffa 100644 --- a/Topology/route.c +++ b/Topology/route.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Topology/search.c b/Topology/search.c index d0c43dc..a4f3cbf 100644 --- a/Topology/search.c +++ b/Topology/search.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -2109,6 +2109,59 @@ ExpectedLink* FindExpectedLinkByOneSide(const FabricData_t *fabricp, EUI64 nodeG // FNOT_FOUND - no instances found // FINVALID_OPERATION - find_flag contains no applicable searches // other - error allocating memory or initializing structures +FSTATUS FindLinkCRCPoint(FabricData_t *fabricp, uint16 crc, LinkCRCCompare comp, Point *pPoint, uint8 find_flag) +{ + FSTATUS status; + + ASSERT(! PointValid(pPoint)); + if (0 == (find_flag & FIND_FLAG_FABRIC)) + return FINVALID_OPERATION; + if (find_flag & FIND_FLAG_FABRIC) { + LIST_ITEM *p; + for (p=QListHead(&fabricp->AllPorts); p != NULL; p = QListNext(&fabricp->AllPorts, p)) { + PortData *portp = (PortData *)QListObj(p); + + boolean match = FALSE; + /* omit switch port 0, CRC is often odd and N/A */ + if (portp->PortNum == 0) + continue; + switch (comp) { + case CRC_EQ: + match = (portp->PortInfo.PortLTPCRCMode.s.Active == crc ); + break; + case CRC_NE: + match = (portp->PortInfo.PortLTPCRCMode.s.Active != crc ); + break; + default: + break; + } + if (match) { + status = PointListAppend(pPoint, POINT_TYPE_PORT_LIST, portp); + if (FSUCCESS != status) + return status; + } + } + } + + // N/A for FIND_FLAG_ENODE, FIND_FLAG_ESM and FIND_FLAG_ELINK + + if (! PointValid(pPoint)) { + char tempbuf[20]; + fprintf(stderr, "%s: Link CRC Not Found: %s %s\n", + g_Top_cmdname, + (comp == CRC_EQ)? "EQ" + : (comp == CRC_NE) ? "NE" + : "", /* should not happen */ + StlPortLtpCrcModeToText(crc, tempbuf, sizeof(tempbuf))); + return FNOT_FOUND; + } + PointCompress(pPoint); + return FSUCCESS; +} + +// FNOT_FOUND - no instances found +// FINVALID_OPERATION - find_flag contains no applicable searches +// other - error allocating memory or initializing structures FSTATUS FindLinkQualityPoint(FabricData_t *fabricp, uint16 quality, LinkQualityCompare comp, Point *pPoint, uint8 find_flag) { FSTATUS status; @@ -2148,8 +2201,13 @@ FSTATUS FindLinkQualityPoint(FabricData_t *fabricp, uint16 quality, LinkQualityC // N/A for FIND_FLAG_ENODE, FIND_FLAG_ESM and FIND_FLAG_ELINK if (! PointValid(pPoint)) { - fprintf(stderr, "%s: Link Quality Not Found: %d\n", - g_Top_cmdname, quality); + fprintf(stderr, "%s: Link Quality Not Found: %s %d\n", + g_Top_cmdname, + (comp == QUAL_EQ)? "EQ" + : (comp == QUAL_GE) ? "GE" + : (comp == QUAL_LE) ? "LE" + : "", /* should not happen */ + quality); return FNOT_FOUND; } PointCompress(pPoint); diff --git a/Topology/snapshot.c b/Topology/snapshot.c index 3244200..aa0b6e4 100644 --- a/Topology/snapshot.c +++ b/Topology/snapshot.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Topology/sweep.c b/Topology/sweep.c index 1283130..7183760 100644 --- a/Topology/sweep.c +++ b/Topology/sweep.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Topology/topology.h b/Topology/topology.h index 38d8449..c041f4b 100644 --- a/Topology/topology.h +++ b/Topology/topology.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -791,6 +791,11 @@ typedef enum { QUAL_LE } LinkQualityCompare; +typedef enum { + CRC_EQ, + CRC_NE +} LinkCRCCompare; + // simple way to convert time_t to a localtime date string in dest // (from Topology/getdate.c) extern void Top_formattime(char *dest, size_t max, time_t t); @@ -1032,6 +1037,7 @@ extern PortData * FindNodeGuidPort(FabricData_t *fabricp,EUI64 nodeguid, uint8 p extern ExpectedNode* FindExpectedNodeByNodeGuid(const FabricData_t* fabricp, EUI64 nodeGuid); extern ExpectedNode* FindExpectedNodeByNodeDesc(const FabricData_t* fabricp, const char* nodeDesc, uint8 NodeType); extern ExpectedLink* FindExpectedLinkByOneSide(const FabricData_t* fabricp, EUI64 nodeGuid, uint8 portNum, uint8* side); +extern FSTATUS FindLinkCRCPoint(FabricData_t *fabricp, uint16 crc, LinkCRCCompare comp, Point *pPoint, uint8 find_flag); extern FSTATUS FindLinkQualityPoint(FabricData_t *fabricp, uint16 quality, LinkQualityCompare comp, Point *pPoint, uint8 find_flag); extern FSTATUS FindLinkDownReasonPoint(FabricData_t *fabricp, uint8 ldr, Point *pPoint, uint8 find_flag); extern FSTATUS FindExpectedSMByPortGuid(FabricData_t *fabricp, EUI64 portGuid); diff --git a/Xml/config_compression.c b/Xml/config_compression.c index bc1da1b..f3ae828 100755 --- a/Xml/config_compression.c +++ b/Xml/config_compression.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -207,7 +207,7 @@ int copyFile(char *src, char*dst, int compressFlag, long *compressedFileSize) { break; } if (header.version != COMP_VERSION) { - SCP_LOG("Unsuported compress file verison %d", __FUNCTION__, header.version); + SCP_LOG("Unsuported compress file version %d", __FUNCTION__, header.version); retVal = -1; break; } diff --git a/Xml/ixml.c b/Xml/ixml.c index 17110df..2eacacc 100644 --- a/Xml/ixml.c +++ b/Xml/ixml.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -399,6 +399,13 @@ void IXmlOutputPrintStr(IXmlOutputState_t *state, const char* value) IXmlOutputPrintStrLen(state, value, IB_INT32_MAX); } +void IXmlOutputPrintStrNewlineContent(IXmlOutputState_t *state, const char* value) +{ + IXmlOutputPrintStrLen(state, value, IB_INT32_MAX); + state->flags &= ~IXML_OUTPUT_FLAG_START_NEED_NL;// don't need NL, using NL from content + state->flags &= ~IXML_OUTPUT_FLAG_HAD_CONTENT; // not real content +} + void IXmlOutputStrLen(IXmlOutputState_t *state, const char *tag, const char* value, int len) { IXmlOutputPrintIndent(state, "<%s>", tag); @@ -894,6 +901,19 @@ boolean IXmlIsWhitespace(const XML_Char *str, boolean *hasNewline) return TRUE; } +/* discard trailing whitespace in str in last line, return new length + * str modified in place + */ +unsigned IXmlTrimTrailingSpaces(XML_Char *str, unsigned len) +{ + // trim trailing spaces till newline + while (len && isspace(str[len-1]) && str[len-1]!='\r' && str[len-1]!='\n') + len--; + str[len] = 0; + + return len; +} + /* discard leading and trailing whitespace in str, return new length * str modified in place */ diff --git a/Xml/ixml.h b/Xml/ixml.h index 7e3d6b3..1cfdc8a 100644 --- a/Xml/ixml.h +++ b/Xml/ixml.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -341,6 +341,7 @@ extern void IXmlOutputHex64(IXmlOutputState_t *state, const char *tag, uint64 va extern void IXmlOutputOptionalHex64(IXmlOutputState_t *state, const char *tag, uint64 value); extern void IXmlOutputPrintStrLen(IXmlOutputState_t *state, const char* value, int len); extern void IXmlOutputPrintStr(IXmlOutputState_t *state, const char* value); +extern void IXmlOutputPrintStrNewlineContent(IXmlOutputState_t *state, const char* value); extern void IXmlOutputStrLen(IXmlOutputState_t *state, const char *tag, const char* value, int len); extern void IXmlOutputOptionalStrLen(IXmlOutputState_t *state, const char *tag, const char* value, int len); extern void IXmlOutputStr(IXmlOutputState_t *state, const char *tag, const char* value); @@ -494,6 +495,11 @@ extern void IXmlParserEndNoop(struct IXmlParserState *state, /* return TRUE if current field's contents are empty or all whitespace */ boolean IXmlIsWhitespace(const XML_Char *str, boolean *hasNewline); +/* discard trailing whitespace in str in last line, return new length + * str modified in place + */ +unsigned IXmlTrimTrailingSpaces(XML_Char *str, unsigned len); + /* discard leading and trailing whitespace in str, return new length * str modified in place */ diff --git a/Xml/ixml_ib.c b/Xml/ixml_ib.c index f2b93c2..fc0498a 100644 --- a/Xml/ixml_ib.c +++ b/Xml/ixml_ib.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Xml/ixml_ib.h b/Xml/ixml_ib.h index ebfa4a3..4fa1c05 100644 --- a/Xml/ixml_ib.h +++ b/Xml/ixml_ib.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Xml/opaxmlindent/opaxmlindent.c b/Xml/opaxmlindent/opaxmlindent.c index 245994e..a2e1c99 100644 --- a/Xml/opaxmlindent/opaxmlindent.c +++ b/Xml/opaxmlindent/opaxmlindent.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -9,7 +9,7 @@ modification, are permitted provided that the following conditions are met: 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. + 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. diff --git a/Xml/xml_sample/xml_sample.c b/Xml/xml_sample/xml_sample.c index 4cfb187..bf1e5ab 100644 --- a/Xml/xml_sample/xml_sample.c +++ b/Xml/xml_sample/xml_sample.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -9,7 +9,7 @@ modification, are permitted provided that the following conditions are met: 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. + 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. diff --git a/Xml/xml_sample2/xml_sample2.c b/Xml/xml_sample2/xml_sample2.c index 6ecbbfb..dcb0de3 100644 --- a/Xml/xml_sample2/xml_sample2.c +++ b/Xml/xml_sample2/xml_sample2.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -9,7 +9,7 @@ modification, are permitted provided that the following conditions are met: 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. + 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. diff --git a/opa-fm.spec.in b/opa-fm.spec.in index 0b28d54..a6b041c 100644 --- a/opa-fm.spec.in +++ b/opa-fm.spec.in @@ -1,6 +1,6 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** # -# Copyright (c) 2015-2018, Intel Corporation +# Copyright (c) 2015-2020, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: @@ -29,8 +29,8 @@ #[ICS VERSION STRING: unknown] Name: opa-fm -Version: 10.10.1.0 -Release: 35%{?dist} +Version: 10.10.3.0 +Release: 11%{?dist} %if 0%{?rhel} Epoch: 1 %endif @@ -39,7 +39,7 @@ Summary: Intel Omni-Path Fabric Management Software License: BSD Url: https://github.com/intel/opa-fm # tarball created by: -# git clone https://github.com/01org/opa-fm.git +# git clone https://github.com/intel/opa-fm.git # cd opa-fm # tar czf opa-fm.tar.gz --exclude-cvs . Source0: %{name}.tar.gz @@ -51,8 +51,10 @@ Requires: rdma BuildRequires: __RPM_BLDRQ1 __RPM_BLDRQ2 +__RPM_BLDRQ3 __RPM_RQ1 __RPM_RQ2 +__RPM_RQ3 __RPM_DEBUG @@ -60,7 +62,7 @@ __RPM_DEBUG 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.10.1.0.35%{?dist} +IFSComponent: FM 10.10.3.0.11%{?dist} %prep %setup -q -c diff --git a/opamgt/include/opamgt_pa_priv.h b/opamgt/include/opamgt_pa_priv.h index 0676ecd..00ba104 100644 --- a/opamgt/include/opamgt_pa_priv.h +++ b/opamgt/include/opamgt_pa_priv.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/opamgt/include/public/opamgt_pa.h b/opamgt/include/public/opamgt_pa.h index bca10d4..f577617 100644 --- a/opamgt/include/public/opamgt_pa.h +++ b/opamgt/include/public/opamgt_pa.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/opamgt/include/public/opamgt_sa.h b/opamgt/include/public/opamgt_sa.h index 22f6edd..836842f 100644 --- a/opamgt/include/public/opamgt_sa.h +++ b/opamgt/include/public/opamgt_sa.h @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/opamgt/samples/saquery.c b/opamgt/samples/saquery.c index 7eda06a..49a6c8e 100644 --- a/opamgt/samples/saquery.c +++ b/opamgt/samples/saquery.c @@ -28,7 +28,7 @@ void Usage() fprintf(stderr, " -b oob_host - perform out of band query. For this example, oob_host\n"); fprintf(stderr, " should have format hostname[:port] or a.b.c.d[:port]\n"); fprintf(stderr, " -o/--output type - output type\n"); - fprintf(stderr, " -x local_gid - local gid for out-of-band queryies that need a local gid\n"); + fprintf(stderr, " -x local_gid - local gid for out-of-band queries that need a local gid\n"); fprintf(stdout, "type: (default is node)\n"); fprintf(stdout, " classportinfo - classportinfo of the SA\n"); fprintf(stdout, " systemguid - list of system image guids\n"); diff --git a/opamgt/src/ib_notice.c b/opamgt/src/ib_notice.c index dd11cc8..c4f3108 100644 --- a/opamgt/src/ib_notice.c +++ b/opamgt/src/ib_notice.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -690,7 +690,7 @@ int create_sa_qp(struct omgt_port *port) } if (ibv_req_notify_cq(port->sa_qp_cq, 0)) { - OMGT_OUTPUT_ERROR(port, "Notice: req_notifiy_cq: failed\n"); + OMGT_OUTPUT_ERROR(port, "Notice: req_notify_cq: failed\n"); goto pd_fail; } diff --git a/opamgt/src/omgt_oob_connections.c b/opamgt/src/omgt_oob_connections.c index 9f65c3c..1a9f550 100644 --- a/opamgt/src/omgt_oob_connections.c +++ b/opamgt/src/omgt_oob_connections.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/opamgt/src/omgt_oob_ssl.c b/opamgt/src/omgt_oob_ssl.c index 3d53170..46cbe32 100644 --- a/opamgt/src/omgt_oob_ssl.c +++ b/opamgt/src/omgt_oob_ssl.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT5 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -386,7 +386,7 @@ void* omgt_oob_ssl_connect(struct omgt_port *port, void *context, int serverfd) // is not presented by the server the connection will be rejected. if (!(cert = SSL_get_peer_certificate(session))) { status = OMGT_STATUS_NOT_FOUND; - OMGT_OUTPUT_ERROR(port, "server has no certifcate to verfiy\n"); + OMGT_OUTPUT_ERROR(port, "server has no certificate to verify\n"); } else { long result; diff --git a/opamgt/src/opamgt.c b/opamgt/src/opamgt.c index 4942f2b..ef0314c 100644 --- a/opamgt/src/opamgt.c +++ b/opamgt/src/opamgt.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -860,7 +860,7 @@ static void destroy_sa_qp(struct omgt_port *port) /* Free any remaining unregistration messages */ if (!LIST_EMPTY(&port->pending_reg_msg_head)) { - OMGT_OUTPUT_ERROR(port, "Ignoring Pending Notice un-registation requests\n"); + OMGT_OUTPUT_ERROR(port, "Ignoring Pending Notice un-registration requests\n"); omgt_sa_remove_all_pending_reg_msgs(port); } diff --git a/opamgt/src/opamgt_dump_mad.c b/opamgt/src/opamgt_dump_mad.c index 279aa9e..5f3c3c2 100644 --- a/opamgt/src/opamgt_dump_mad.c +++ b/opamgt/src/opamgt_dump_mad.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/opamgt/src/opamgt_pa.c b/opamgt/src/opamgt_pa.c index 29841bd..9300f0a 100644 --- a/opamgt/src/opamgt_pa.c +++ b/opamgt/src/opamgt_pa.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -251,7 +251,7 @@ pa_query_common( rcv_mad->SaHdr.AttributeOffset, rcv_mad->SaHdr.AttributeOffset, (rcv_mad->SaHdr.AttributeOffset * 8)); OMGT_DBGPRINT(port, " Reserved (0x%x)\n", rcv_mad->SaHdr.Reserved); - //OMGT_DBGPRINT(port, " ComponetMask (0x%016"PRIx64")\n", rcv_mad->SaHdr.ComponentMask); + //OMGT_DBGPRINT(port, " ComponentMask (0x%016"PRIx64")\n", rcv_mad->SaHdr.ComponentMask); rec_sz = rcv_mad->SaHdr.AttributeOffset * 8; if (rcv_mad->common.mr.AsReg8 == STL_PA_CMD_GET_RESP) { @@ -401,7 +401,7 @@ omgt_pa_get_classportinfo( request_data, sizeof(request_data), &rcv_buf_len, &rsp_mad, &query_result); if (fstatus != FSUCCESS) { if (port->pa_verbose) - OMGT_OUTPUT_ERROR(port, "Error, requeset failed: status=%u\n", (unsigned int)fstatus); + OMGT_OUTPUT_ERROR(port, "Error, request failed: status=%u\n", (unsigned int)fstatus); goto done; } else if (rsp_mad->SaHdr.AttributeOffset) { if (port->pa_verbose) @@ -490,7 +490,7 @@ iba_pa_single_mad_port_counters_response_query( request_data, sizeof(request_data), &rcv_buf_len, &rsp_mad, &query_result); if (fstatus != FSUCCESS) { if (port->pa_verbose) - OMGT_OUTPUT_ERROR(port, "Error, requeset failed: status=%u\n", (unsigned int)fstatus); + OMGT_OUTPUT_ERROR(port, "Error, request failed: status=%u\n", (unsigned int)fstatus); goto done; } else if (rsp_mad->SaHdr.AttributeOffset) { if (port->pa_verbose) @@ -566,7 +566,7 @@ iba_pa_single_mad_clr_port_counters_response_query( request_data, sizeof(request_data), &rcv_buf_len, &rsp_mad, &query_result); if (fstatus != FSUCCESS) { if (port->pa_verbose) - OMGT_OUTPUT_ERROR(port, "Error, requeset failed: status=%u\n", (unsigned int)fstatus); + OMGT_OUTPUT_ERROR(port, "Error, request failed: status=%u\n", (unsigned int)fstatus); goto done; } else if (rsp_mad->SaHdr.AttributeOffset) { if (port->pa_verbose) @@ -634,7 +634,7 @@ iba_pa_single_mad_clr_all_port_counters_response_query( request_data, sizeof(request_data), &rcv_buf_len, &rsp_mad, &query_result); if (fstatus != FSUCCESS) { if (port->pa_verbose) - OMGT_OUTPUT_ERROR(port, "Error, requeset failed: status=%u\n", (unsigned int)fstatus); + OMGT_OUTPUT_ERROR(port, "Error, request failed: status=%u\n", (unsigned int)fstatus); goto done; } else if (rsp_mad->SaHdr.AttributeOffset) { if (port->pa_verbose) @@ -694,7 +694,7 @@ iba_pa_single_mad_get_pm_config_response_query( request_data, sizeof(request_data), &rcv_buf_len, &rsp_mad, &query_result); if (fstatus != FSUCCESS) { if (port->pa_verbose) - OMGT_OUTPUT_ERROR(port, "Error, requeset failed: status=%u\n", (unsigned int)fstatus); + OMGT_OUTPUT_ERROR(port, "Error, request failed: status=%u\n", (unsigned int)fstatus); goto done; } else if (rsp_mad->SaHdr.AttributeOffset) { if (port->pa_verbose) @@ -761,7 +761,7 @@ iba_pa_single_mad_freeze_image_response_query( request_data, sizeof(request_data), &rcv_buf_len, &rsp_mad, &query_result); if (fstatus != FSUCCESS) { if (port->pa_verbose) - OMGT_OUTPUT_ERROR(port, "Error, requeset failed: status=%u\n", (unsigned int)fstatus); + OMGT_OUTPUT_ERROR(port, "Error, request failed: status=%u\n", (unsigned int)fstatus); goto done; } else if (rsp_mad->SaHdr.AttributeOffset) { if (port->pa_verbose) @@ -828,7 +828,7 @@ iba_pa_single_mad_release_image_response_query( request_data, sizeof(request_data), &rcv_buf_len, &rsp_mad, &query_result); if (fstatus != FSUCCESS) { if (port->pa_verbose) - OMGT_OUTPUT_ERROR(port, "Error, requeset failed: status=%u\n", (unsigned int)fstatus); + OMGT_OUTPUT_ERROR(port, "Error, request failed: status=%u\n", (unsigned int)fstatus); goto done; } else if (rsp_mad->SaHdr.AttributeOffset) { if (port->pa_verbose) @@ -895,7 +895,7 @@ iba_pa_single_mad_renew_image_response_query( request_data, sizeof(request_data), &rcv_buf_len, &rsp_mad, &query_result); if (fstatus != FSUCCESS) { if (port->pa_verbose) - OMGT_OUTPUT_ERROR(port, "Error, requeset failed: status=%u\n", (unsigned int)fstatus); + OMGT_OUTPUT_ERROR(port, "Error, request failed: status=%u\n", (unsigned int)fstatus); goto done; } else if (rsp_mad->SaHdr.AttributeOffset) { if (port->pa_verbose) @@ -961,7 +961,7 @@ iba_pa_single_mad_move_freeze_response_query( request_data, sizeof(request_data), &rcv_buf_len, &rsp_mad, &query_result); if (fstatus != FSUCCESS) { if (port->pa_verbose) - OMGT_OUTPUT_ERROR(port, "Error, requeset failed: status=%u\n", (unsigned int)fstatus); + OMGT_OUTPUT_ERROR(port, "Error, request failed: status=%u\n", (unsigned int)fstatus); goto done; } else if (rsp_mad->SaHdr.AttributeOffset) { if (port->pa_verbose) @@ -1029,7 +1029,7 @@ iba_pa_multi_mad_get_image_info_response_query ( request_data, sizeof(request_data), &rcv_buf_len, &rsp_mad, &query_result); if (fstatus != FSUCCESS) { if (port->pa_verbose) - OMGT_OUTPUT_ERROR(port, "Error, requeset failed: status=%u\n", (unsigned int)fstatus); + OMGT_OUTPUT_ERROR(port, "Error, request failed: status=%u\n", (unsigned int)fstatus); goto done; } else { if (port->pa_verbose) { @@ -1095,7 +1095,7 @@ iba_pa_multi_mad_group_list_response_query( request_data, sizeof(request_data), &rcv_buf_len, &rsp_mad, &query_result); if (fstatus != FSUCCESS) { if (port->pa_verbose) - OMGT_OUTPUT_ERROR(port, "Error, requeset failed: status=%u\n", (unsigned int)fstatus); + OMGT_OUTPUT_ERROR(port, "Error, request failed: status=%u\n", (unsigned int)fstatus); goto done; } else { if (port->pa_verbose) { @@ -1164,7 +1164,7 @@ iba_pa_multi_mad_group_list2_response_query( request_data, sizeof(request_data), &rcv_buf_len, &rsp_mad, &query_result); if (fstatus != FSUCCESS) { if (port->pa_verbose) - OMGT_OUTPUT_ERROR(port, "Error, requeset failed: status=%u\n", (unsigned int)fstatus); + OMGT_OUTPUT_ERROR(port, "Error, request failed: status=%u\n", (unsigned int)fstatus); goto done; } else { if (port->pa_verbose) { @@ -1251,7 +1251,7 @@ iba_pa_multi_mad_group_stats_response_query( request_data, sizeof(request_data), &rcv_buf_len, &rsp_mad, &query_result); if (fstatus != FSUCCESS){ if (port->pa_verbose) - OMGT_OUTPUT_ERROR(port, "Error, requeset failed: status=%u\n",(unsigned int)fstatus); + OMGT_OUTPUT_ERROR(port, "Error, request failed: status=%u\n",(unsigned int)fstatus); goto done; } else { if (port->pa_verbose){ @@ -1340,7 +1340,7 @@ iba_pa_multi_mad_group_config_response_query( request_data, sizeof(request_data), &rcv_buf_len, &rsp_mad, &query_result); if (fstatus != FSUCCESS){ if (port->pa_verbose) - OMGT_OUTPUT_ERROR(port, "Error, requeset failed: status=%u\n",(unsigned int)fstatus); + OMGT_OUTPUT_ERROR(port, "Error, request failed: status=%u\n",(unsigned int)fstatus); goto done; } else { if (port->pa_verbose){ @@ -1439,7 +1439,7 @@ iba_pa_multi_mad_group_nodeinfo_response_query( request_data, sizeof(request_data), &rcv_buf_len, &rsp_mad, &query_result); if (fstatus != FSUCCESS){ if (port->pa_verbose) - OMGT_OUTPUT_ERROR(port, "Error, requeset failed: status=%u\n",(unsigned int)fstatus); + OMGT_OUTPUT_ERROR(port, "Error, request failed: status=%u\n",(unsigned int)fstatus); goto done; } else { if (port->pa_verbose){ @@ -1534,7 +1534,7 @@ iba_pa_multi_mad_group_linkinfo_response_query( request_data, sizeof(request_data), &rcv_buf_len, &rsp_mad, &query_result); if (fstatus != FSUCCESS){ if (port->pa_verbose) - OMGT_OUTPUT_ERROR(port, "Error, requeset failed: status=%u\n",(unsigned int)fstatus); + OMGT_OUTPUT_ERROR(port, "Error, request failed: status=%u\n",(unsigned int)fstatus); goto done; } else { if (port->pa_verbose){ @@ -1633,7 +1633,7 @@ iba_pa_multi_mad_focus_ports_response_query ( request_data, sizeof(request_data), &rcv_buf_len, &rsp_mad, &query_result); if (fstatus != FSUCCESS) { if (port->pa_verbose) - OMGT_OUTPUT_ERROR(port, "Error, requeset failed: status=%u\n", (unsigned int)fstatus); + OMGT_OUTPUT_ERROR(port, "Error, request failed: status=%u\n", (unsigned int)fstatus); goto done; } else { if (port->pa_verbose) { @@ -1740,7 +1740,7 @@ iba_pa_multi_mad_focus_ports_multiselect_response_query ( request_data, sizeof(request_data), &rcv_buf_len, &rsp_mad, &query_result); if (fstatus != FSUCCESS) { if (port->pa_verbose) - OMGT_OUTPUT_ERROR(port, "Error, requeset failed: status=%u\n", (unsigned int)fstatus); + OMGT_OUTPUT_ERROR(port, "Error, request failed: status=%u\n", (unsigned int)fstatus); goto done; } else { if (port->pa_verbose) { @@ -1817,7 +1817,7 @@ iba_pa_multi_mad_vf_list_response_query( request_data, sizeof(request_data), &rcv_buf_len, &rsp_mad, &query_result); if (fstatus != FSUCCESS){ if (port->pa_verbose) - OMGT_OUTPUT_ERROR(port, "Error, requeset failed: status=%u\n",(unsigned int)fstatus); + OMGT_OUTPUT_ERROR(port, "Error, request failed: status=%u\n",(unsigned int)fstatus); goto done; } else { if (port->pa_verbose){ @@ -1885,7 +1885,7 @@ iba_pa_multi_mad_vf_list2_response_query( request_data, sizeof(request_data), &rcv_buf_len, &rsp_mad, &query_result); if (fstatus != FSUCCESS) { if (port->pa_verbose) - OMGT_OUTPUT_ERROR(port, "Error, requeset failed: status=%u\n", (unsigned int)fstatus); + OMGT_OUTPUT_ERROR(port, "Error, request failed: status=%u\n", (unsigned int)fstatus); goto done; } else { if (port->pa_verbose) { @@ -1973,7 +1973,7 @@ iba_pa_multi_mad_vf_info_response_query( request_data, sizeof(request_data), &rcv_buf_len, &rsp_mad, &query_result); if (fstatus != FSUCCESS){ if (port->pa_verbose) - OMGT_OUTPUT_ERROR(port, "Error, requeset failed: status=%u\n",(unsigned int)fstatus); + OMGT_OUTPUT_ERROR(port, "Error, request failed: status=%u\n",(unsigned int)fstatus); goto done; } else { if (port->pa_verbose){ @@ -2062,7 +2062,7 @@ iba_pa_multi_mad_vf_config_response_query( request_data, sizeof(request_data), &rcv_buf_len, &rsp_mad, &query_result); if (fstatus != FSUCCESS) { if (port->pa_verbose) - OMGT_OUTPUT_ERROR(port, "Error, requeset failed: status=%u\n", (unsigned int)fstatus); + OMGT_OUTPUT_ERROR(port, "Error, request failed: status=%u\n", (unsigned int)fstatus); goto done; } else { if (port->pa_verbose) { @@ -2140,7 +2140,7 @@ iba_pa_single_mad_vf_port_counters_response_query( request_data, sizeof(request_data), &rcv_buf_len, &rsp_mad, &query_result); if (fstatus != FSUCCESS) { if (port->pa_verbose) - OMGT_OUTPUT_ERROR(port, "Error, requeset failed: status=%u\n", (unsigned int)fstatus); + OMGT_OUTPUT_ERROR(port, "Error, request failed: status=%u\n", (unsigned int)fstatus); goto done; } else if (rsp_mad->SaHdr.AttributeOffset) { if (port->pa_verbose) @@ -2203,7 +2203,7 @@ iba_pa_single_mad_clr_vf_port_counters_response_query( request_data, sizeof(request_data), &rcv_buf_len, &rsp_mad, &query_result); if (fstatus != FSUCCESS) { if (port->pa_verbose) - OMGT_OUTPUT_ERROR(port, "Error, requeset failed: status=%u\n", (unsigned int)fstatus); + OMGT_OUTPUT_ERROR(port, "Error, request failed: status=%u\n", (unsigned int)fstatus); goto done; } else if (rsp_mad->SaHdr.AttributeOffset) { if (port->pa_verbose) @@ -2277,7 +2277,7 @@ iba_pa_multi_mad_vf_focus_ports_response_query ( request_data, sizeof(request_data), &rcv_buf_len, &rsp_mad, &query_result); if (fstatus != FSUCCESS){ if (port->pa_verbose) - OMGT_OUTPUT_ERROR(port, "Error, requeset failed: status=%u\n",(unsigned int)fstatus); + OMGT_OUTPUT_ERROR(port, "Error, request failed: status=%u\n",(unsigned int)fstatus); goto done; } else { if (port->pa_verbose){ diff --git a/opamgt/src/opamgt_sa.c b/opamgt/src/opamgt_sa.c index c5dd907..a39224b 100644 --- a/opamgt/src/opamgt_sa.c +++ b/opamgt/src/opamgt_sa.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -369,7 +369,7 @@ static FSTATUS sa_query_common(SA_MAD * pSA, SA_MAD **ppRsp, uint32_t record_siz (*ppRsp)->SaHdr.AttributeOffset, (*ppRsp)->SaHdr.AttributeOffset, ((*ppRsp)->SaHdr.AttributeOffset * 8)); OMGT_DBGPRINT(port, " Reserved (0x%x)\n", (*ppRsp)->SaHdr.Reserved); - OMGT_DBGPRINT(port, " ComponetMask (0x%016"PRIx64")\n", (*ppRsp)->SaHdr.ComponentMask); + OMGT_DBGPRINT(port, " ComponentMask (0x%016"PRIx64")\n", (*ppRsp)->SaHdr.ComponentMask); // if no records IBTA 1.2.1 says AttributeOffset should be 0 if ((*ppRsp)->common.mr.AsReg8 == SUBN_ADM_GET_RESP) { diff --git a/opamgt/src/opamgt_sa_notice.c b/opamgt/src/opamgt_sa_notice.c index 44357a0..a7ec23a 100644 --- a/opamgt/src/opamgt_sa_notice.c +++ b/opamgt/src/opamgt_sa_notice.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2017, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -219,7 +219,7 @@ OMGT_STATUS_T omgt_sa_get_notice_report(struct omgt_port *port, STL_NOTICE **not /* Otherwise error */ } else { SA_MAD *samad = (SA_MAD *)&packet->MadData.common; - OMGT_OUTPUT_ERROR(port, "Unexpected OOB MAD recieved: %s %s(%s)\n", + OMGT_OUTPUT_ERROR(port, "Unexpected OOB MAD received: %s %s(%s)\n", stl_class_str(samad->common.BaseVersion, samad->common.MgmtClass), stl_method_str(samad->common.BaseVersion, samad->common.MgmtClass, samad->common.mr.AsReg8), stl_attribute_str(samad->common.BaseVersion, samad->common.MgmtClass, hton16(samad->common.AttributeID))); diff --git a/opamgt/src/opamgt_sa_query.c b/opamgt/src/opamgt_sa_query.c index 6025a3c..27100ce 100644 --- a/opamgt/src/opamgt_sa_query.c +++ b/opamgt/src/opamgt_sa_query.c @@ -1,6 +1,6 @@ /* BEGIN_ICS_COPYRIGHT2 **************************************** -Copyright (c) 2015-2018, Intel Corporation +Copyright (c) 2015-2020, Intel Corporation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: