diff --git a/CommonInstall/DESIGN b/CommonInstall/DESIGN
index 4641059f..e2d9b027 100644
--- a/CommonInstall/DESIGN
+++ b/CommonInstall/DESIGN
@@ -3,14 +3,14 @@ All the util_*pl files are provide utility functions for use.
The comp*pl files are various examples of comp.pl files for assorted products.
the main*pl files are the main installer algorithm for assorted packagings,
-the one of interest for IntelOPA-IFS is main_omnipathwrap_delta.pl
+the one of interest for CornelisOPX-OPXS is main_omnipathwrap_delta.pl
The comp_qlgc_fm.pl is a good example. It implements a component consisting of
two user space rpms with init.d scripts.
The main*pl defines which components are part of the packaging and what their
-capabilities are. main_omnipathwrap_delta.pl is a packaging for IntelOPA-IFS
-and IntelOPA-Basic. This main is also used for individual component INSTALLs
+capabilities are. main_omnipathwrap_delta.pl is a packaging for CornelisOPX-OPXS
+and CornelisOPX-Basic. This main is also used for individual component INSTALLs
along with the corresponding override*pl file.
routines in a comp.pl file:
diff --git a/CommonInstall/Makefile b/CommonInstall/Makefile
index e350ec0a..b2d8d857 100644
--- a/CommonInstall/Makefile
+++ b/CommonInstall/Makefile
@@ -1,7 +1,7 @@
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015-2020, Intel Corporation
-# Copyright (c) 2020, Cornelis Networks, Inc.
+# Copyright (c) 2020-2021, Cornelis Networks, Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
@@ -97,13 +97,33 @@ CMD_TARGETS_MISC =
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_RHEL82.pl comp_ff_of_prereq_RHEL83.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_RHEL82.pl \
- comp_fm_prereq_RHEL83.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
+CLOBBER_TARGETS_MISC= 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_RHEL83.pl \
+ comp_ff_of_prereq_RHEL84.pl \
+ comp_ff_of_prereq_RHEL85.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_ff_of_prereq_SLES153.pl \
+ comp_fm_prereq_RHEL77.pl \
+ comp_fm_prereq_RHEL8.pl \
+ comp_fm_prereq_RHEL81.pl \
+ comp_fm_prereq_RHEL82.pl \
+ comp_fm_prereq_RHEL83.pl \
+ comp_fm_prereq_RHEL84.pl \
+ comp_fm_prereq_RHEL85.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 \
+ comp_fm_prereq_SLES153.pl
# sub-directory to install to within bin
BIN_SUBDIR =
# sub-directory to install to within include
@@ -129,16 +149,34 @@ 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_RHEL78.pl \
- comp_ff_of_prereq_RHEL8.pl comp_ff_of_prereq_RHEL81.pl comp_ff_of_prereq_RHEL82.pl comp_ff_of_prereq_RHEL83.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
-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_RHEL78.pl \
- comp_fm_prereq_RHEL8.pl comp_fm_prereq_RHEL81.pl comp_fm_prereq_RHEL82.pl comp_fm_prereq_RHEL83.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
+FF_FILES = 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_RHEL83.pl \
+ comp_ff_of_prereq_RHEL84.pl \
+ comp_ff_of_prereq_RHEL85.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_ff_of_prereq_SLES153.pl
+FM_FILES = 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_RHEL83.pl \
+ comp_fm_prereq_RHEL84.pl \
+ comp_fm_prereq_RHEL85.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 \
+ comp_fm_prereq_SLES153.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 efb9ad67..6f747ea9 100755
--- a/CommonInstall/comp_delta.pl
+++ b/CommonInstall/comp_delta.pl
@@ -2,7 +2,7 @@
# BEGIN_ICS_COPYRIGHT8
#
# Copyright (c) 2015-2020, Intel Corporation
-# Copyright (c) 2020, Cornelis Networks, Inc.
+# Copyright (c) 2020-2021, Cornelis Networks, Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
@@ -78,6 +78,7 @@
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_sles15_sp3 = ( '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' );
@@ -88,6 +89,8 @@
my @delta_kernel_srpms_rhel81 = ( 'kmod-ifs-kernel-updates' );
my @delta_kernel_srpms_rhel82 = ( 'kmod-ifs-kernel-updates' );
my @delta_kernel_srpms_rhel83 = ( 'kmod-ifs-kernel-updates' );
+my @delta_kernel_srpms_rhel84 = ( 'kmod-ifs-kernel-updates' );
+my @delta_kernel_srpms_rhel85 = ( 'kmod-ifs-kernel-updates' );
my @delta_kernel_srpms = ( );
# This provides information for all kernel srpms
@@ -165,12 +168,19 @@ ($)
} elsif ("$CUR_DISTRO_VENDOR" eq 'SuSE'
&& "$CUR_VENDOR_VER" eq 'ES152') {
@delta_kernel_srpms = ( @delta_kernel_srpms_sles15_sp2 );
+ } elsif ("$CUR_DISTRO_VENDOR" eq 'SuSE'
+ && "$CUR_VENDOR_VER" eq 'ES153') {
+ @delta_kernel_srpms = ( @delta_kernel_srpms_sles15_sp3 );
} 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 "ES85" ) {
+ @delta_kernel_srpms = ( @delta_kernel_srpms_rhel85 );
+ } elsif ( "$CUR_VENDOR_VER" eq "ES84" ) {
+ @delta_kernel_srpms = ( @delta_kernel_srpms_rhel84 );
} elsif ( "$CUR_VENDOR_VER" eq "ES83" ) {
@delta_kernel_srpms = ( @delta_kernel_srpms_rhel83 );
} elsif ( "$CUR_VENDOR_VER" eq "ES82" ) {
@@ -441,7 +451,7 @@ ($$$$$$)
# use a different directory for BUILD_ROOT to limit conflict with OFED
if ("$build_temp" eq "" ) {
- $build_temp = "/var/tmp/IntelOPA-DELTA";
+ $build_temp = "/var/tmp/CornelisOPX-DELTA";
}
my $BUILD_ROOT="$build_temp/build";
my $RPM_DIR="$build_temp/DELTARPMS";
@@ -810,6 +820,12 @@ ()
return ( has_version_delta()
&& rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER));
}
+ } elsif ( "$CUR_VENDOR_VER" eq "ES85" ) {
+ return ( has_version_delta()
+ && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER));
+ } elsif ( "$CUR_VENDOR_VER" eq "ES84" ) {
+ return ( has_version_delta()
+ && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER));
} elsif ( "$CUR_VENDOR_VER" eq "ES83" ) {
return ( has_version_delta()
&& rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER));
@@ -855,6 +871,9 @@ ()
} elsif ( "$CUR_VENDOR_VER" eq 'ES152' ) {
return ( has_version_delta()
&& rpm_is_installed("ifs-kernel-updates-kmp-default", $CUR_OS_VER));
+ } elsif ( "$CUR_VENDOR_VER" eq 'ES153' ) {
+ return ( has_version_delta()
+ && rpm_is_installed("ifs-kernel-updates-kmp-default", $CUR_OS_VER));
} else {
return 0;
}
@@ -1161,6 +1180,12 @@ ()
} elsif ( "$CUR_VENDOR_VER" eq "ES83" ) {
return (has_version_delta()
&& rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER));
+ } elsif ( "$CUR_VENDOR_VER" eq "ES84" ) {
+ return (has_version_delta()
+ && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER));
+ } elsif ( "$CUR_VENDOR_VER" eq "ES85" ) {
+ return (has_version_delta()
+ && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER));
} elsif ( "$CUR_VENDOR_VER" eq "ES123" ) {
return (has_version_delta()
&& rpm_is_installed("ifs-kernel-updates-kmp-default", $CUR_OS_VER));
@@ -1179,6 +1204,9 @@ ()
} elsif ( "$CUR_VENDOR_VER" eq "ES152" ) {
return (has_version_delta()
&& rpm_is_installed("ifs-kernel-updates-kmp-default", $CUR_OS_VER));
+ } elsif ( "$CUR_VENDOR_VER" eq "ES153" ) {
+ 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
deleted file mode 100644
index 727e9056..00000000
--- a/CommonInstall/comp_delta_prereq_RHEL72.pl
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/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",
- "systemd",
- "glibc",
- "libibumad",
- "libibumad-devel",
- "libibverbs",
- "pciutils",
- "opensm-libs",
- "libibcm",
-);
-$comp_prereq_hash{'opa_stack_prereq'} = \@opa_stack_prereq;
-
-my @ibacm_prereq = (
- "bash",
- "chkconfig",
- "glibc",
- "libibumad",
- "libibverbs",
-);
-$comp_prereq_hash{'ibacm_prereq'} = \@ibacm_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",
- "libibverbs",
- "python",
- "systemd",
- "numactl-libs",
- "irqbalance",
-);
-$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",
-
-);
-$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_RHEL73.pl b/CommonInstall/comp_delta_prereq_RHEL73.pl
deleted file mode 100644
index c6947381..00000000
--- a/CommonInstall/comp_delta_prereq_RHEL73.pl
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/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",
- "systemd",
- "glibc",
- "pciutils",
- "opensm-libs",
- "libibmad",
- "libibcm",
- "libibumad",
- "libibumad-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",
- "libhfi1",
- "glibc",
- "libgcc",
- "python",
- "systemd",
- "numactl-libs",
- "irqbalance",
-);
-$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_RHEL74.pl b/CommonInstall/comp_delta_prereq_RHEL74.pl
deleted file mode 100644
index 86f77772..00000000
--- a/CommonInstall/comp_delta_prereq_RHEL74.pl
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/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",
- "libibcm",
- "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",
-);
-$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_RHEL76.pl b/CommonInstall/comp_delta_prereq_RHEL84.pl
similarity index 97%
rename from CommonInstall/comp_delta_prereq_RHEL76.pl
rename to CommonInstall/comp_delta_prereq_RHEL84.pl
index 14ccab75..6bd17567 100644
--- a/CommonInstall/comp_delta_prereq_RHEL76.pl
+++ b/CommonInstall/comp_delta_prereq_RHEL84.pl
@@ -2,6 +2,7 @@
## BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015-2020, Intel Corporation
+# Copyright (c) 2020, Cornelis Networks, Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
@@ -65,7 +66,7 @@
"bash",
"glibc",
"libgcc",
- "python",
+ "python2",
"systemd",
"numactl-libs",
"irqbalance",
@@ -96,7 +97,7 @@
"libstdc++",
"libstdc++-devel",
"opensm-libs",
- "pkgconfig",
+ "pkgconf",
"zlib",
);
$comp_prereq_hash{'openmpi_prereq'} = \@openmpi_prereq;
@@ -116,7 +117,6 @@
my @openmpi_gcc_hfi_prereq = (
"bash",
"glibc",
- "infinipath-psm",
"libgcc",
"libgfortran",
"gcc-gfortran",
@@ -127,7 +127,7 @@
"libstdc++",
"libstdc++-devel",
"opensm-libs",
- "pkgconfig",
+ "pkgconf",
"zlib",
);
$comp_prereq_hash{'openmpi_gcc_hfi_prereq'} = \@openmpi_gcc_hfi_prereq;
diff --git a/CommonInstall/comp_delta_prereq_RHEL75.pl b/CommonInstall/comp_delta_prereq_RHEL85.pl
similarity index 97%
rename from CommonInstall/comp_delta_prereq_RHEL75.pl
rename to CommonInstall/comp_delta_prereq_RHEL85.pl
index b4ddacc3..6bd17567 100644
--- a/CommonInstall/comp_delta_prereq_RHEL75.pl
+++ b/CommonInstall/comp_delta_prereq_RHEL85.pl
@@ -2,6 +2,7 @@
## BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015-2020, Intel Corporation
+# Copyright (c) 2020, Cornelis Networks, Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
@@ -47,7 +48,6 @@
"glibc",
"pciutils",
"opensm-libs",
- "libibcm",
"libibumad",
"rdma-core-devel",
);
@@ -66,7 +66,7 @@
"bash",
"glibc",
"libgcc",
- "python",
+ "python2",
"systemd",
"numactl-libs",
"irqbalance",
@@ -97,7 +97,7 @@
"libstdc++",
"libstdc++-devel",
"opensm-libs",
- "pkgconfig",
+ "pkgconf",
"zlib",
);
$comp_prereq_hash{'openmpi_prereq'} = \@openmpi_prereq;
@@ -117,7 +117,6 @@
my @openmpi_gcc_hfi_prereq = (
"bash",
"glibc",
- "infinipath-psm",
"libgcc",
"libgfortran",
"gcc-gfortran",
@@ -128,7 +127,7 @@
"libstdc++",
"libstdc++-devel",
"opensm-libs",
- "pkgconfig",
+ "pkgconf",
"zlib",
);
$comp_prereq_hash{'openmpi_gcc_hfi_prereq'} = \@openmpi_gcc_hfi_prereq;
diff --git a/CommonInstall/comp_delta_prereq_SLES122.pl b/CommonInstall/comp_delta_prereq_SLES153.pl
similarity index 95%
rename from CommonInstall/comp_delta_prereq_SLES122.pl
rename to CommonInstall/comp_delta_prereq_SLES153.pl
index 939ac302..687da207 100644
--- a/CommonInstall/comp_delta_prereq_SLES122.pl
+++ b/CommonInstall/comp_delta_prereq_SLES153.pl
@@ -2,6 +2,7 @@
## BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015-2020, Intel Corporation
+# Copyright (c) 2020-2021, Cornelis Networks
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
@@ -41,28 +42,27 @@
my @opa_stack_prereq = (
"bash",
"kmod",
- "rdma",
+ "rdma-core",
+ "rdma-ndd",
"systemd",
"coreutils",
"grep",
- "opensm-libs3",
+ "libosmcomp5",
"libibmad5",
- "libibcm1",
"libibumad3",
- "libibumad-devel",
+ "rdma-core-devel",
);
$comp_prereq_hash{'opa_stack_prereq'} = \@opa_stack_prereq;
my @intel_hfi_prereq = (
"glibc",
- "libhfi1verbs-rdmav2",
"libgcc_s1",
"bash",
"udev",
"libudev-devel",
"python-base",
"libedit0",
- "libncurses5",
+ "libncurses6",
"libnuma1",
"irqbalance",
"libatomic1",
@@ -86,10 +86,9 @@
my @openmpi_gcc_hfi_prereq = (
"glibc",
"bash",
- "libpsm_infinipath1",
"pkg-config",
"libgcc_s1",
- "libgfortran3",
+ "libgfortran4",
"gcc-fortran",
"libgomp1",
"libibverbs1",
@@ -97,7 +96,6 @@
"librdmacm1",
"libstdc++6",
"libz1",
- "opensm-libs3",
"opensm-devel",
"mpi-selector",
);
diff --git a/CommonInstall/comp_ff_of_prereq_RHEL72.pl b/CommonInstall/comp_ff_of_prereq_RHEL72.pl
deleted file mode 100644
index 541e71f2..00000000
--- a/CommonInstall/comp_ff_of_prereq_RHEL72.pl
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/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++",
-);
-$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",
- "tcl",
- "zlib",
-);
-$comp_prereq_hash{'fastfabric_prereq'} = \@fastfabric_prereq;
-
-my @opamgt_sdk_prereq = (
- "bash",
- "glibc",
- "libgcc",
- "libibumad",
- "libibumad-devel",
- "libibverbs",
- "libibverbs-devel",
- "libstdc++",
- "openssl",
- "openssl-devel",
- "openssl-libs",
-);
-$comp_prereq_hash{'opamgt_sdk_prereq'} = \@opamgt_sdk_prereq;
diff --git a/CommonInstall/comp_ff_of_prereq_RHEL72.pl.base b/CommonInstall/comp_ff_of_prereq_RHEL72.pl.base
deleted file mode 100644
index 541e71f2..00000000
--- a/CommonInstall/comp_ff_of_prereq_RHEL72.pl.base
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/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++",
-);
-$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",
- "tcl",
- "zlib",
-);
-$comp_prereq_hash{'fastfabric_prereq'} = \@fastfabric_prereq;
-
-my @opamgt_sdk_prereq = (
- "bash",
- "glibc",
- "libgcc",
- "libibumad",
- "libibumad-devel",
- "libibverbs",
- "libibverbs-devel",
- "libstdc++",
- "openssl",
- "openssl-devel",
- "openssl-libs",
-);
-$comp_prereq_hash{'opamgt_sdk_prereq'} = \@opamgt_sdk_prereq;
diff --git a/CommonInstall/comp_ff_of_prereq_RHEL73.pl b/CommonInstall/comp_ff_of_prereq_RHEL73.pl
deleted file mode 100644
index c5fcbfef..00000000
--- a/CommonInstall/comp_ff_of_prereq_RHEL73.pl
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/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",
- "libibmad",
- "libibumad",
- "libibverbs",
- "libhfi1",
- "libstdc++",
- "ibacm",
-);
-$comp_prereq_hash{'oftools_prereq'} = \@oftools_prereq;
-
-my @fastfabric_prereq = (
- "atlas",
- "bash",
- "bc",
- "expat",
- "expect",
- "glibc",
- "libgcc",
- "libibmad",
- "libibumad",
- "libibverbs",
- "libhfi1",
- "libstdc++",
- "ncurses-libs",
- "openssl-libs",
- "perl",
- "perl-Getopt-Long",
- "perl-Socket",
- "rdma",
- "tcl",
- "zlib",
-);
-$comp_prereq_hash{'fastfabric_prereq'} = \@fastfabric_prereq;
-
-my @opamgt_sdk_prereq = (
- "bash",
- "glibc",
- "libgcc",
- "libibumad",
- "libibumad-devel",
- "libibverbs",
- "libibverbs-devel",
- "libstdc++",
- "openssl",
- "openssl-devel",
- "openssl-libs",
-);
-$comp_prereq_hash{'opamgt_sdk_prereq'} = \@opamgt_sdk_prereq;
diff --git a/CommonInstall/comp_ff_of_prereq_RHEL73.pl.base b/CommonInstall/comp_ff_of_prereq_RHEL73.pl.base
deleted file mode 100644
index c5fcbfef..00000000
--- a/CommonInstall/comp_ff_of_prereq_RHEL73.pl.base
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/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",
- "libibmad",
- "libibumad",
- "libibverbs",
- "libhfi1",
- "libstdc++",
- "ibacm",
-);
-$comp_prereq_hash{'oftools_prereq'} = \@oftools_prereq;
-
-my @fastfabric_prereq = (
- "atlas",
- "bash",
- "bc",
- "expat",
- "expect",
- "glibc",
- "libgcc",
- "libibmad",
- "libibumad",
- "libibverbs",
- "libhfi1",
- "libstdc++",
- "ncurses-libs",
- "openssl-libs",
- "perl",
- "perl-Getopt-Long",
- "perl-Socket",
- "rdma",
- "tcl",
- "zlib",
-);
-$comp_prereq_hash{'fastfabric_prereq'} = \@fastfabric_prereq;
-
-my @opamgt_sdk_prereq = (
- "bash",
- "glibc",
- "libgcc",
- "libibumad",
- "libibumad-devel",
- "libibverbs",
- "libibverbs-devel",
- "libstdc++",
- "openssl",
- "openssl-devel",
- "openssl-libs",
-);
-$comp_prereq_hash{'opamgt_sdk_prereq'} = \@opamgt_sdk_prereq;
diff --git a/CommonInstall/comp_ff_of_prereq_RHEL74.pl b/CommonInstall/comp_ff_of_prereq_RHEL74.pl
deleted file mode 100644
index c960e74e..00000000
--- a/CommonInstall/comp_ff_of_prereq_RHEL74.pl
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/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_RHEL74.pl.base b/CommonInstall/comp_ff_of_prereq_RHEL74.pl.base
deleted file mode 100644
index c960e74e..00000000
--- a/CommonInstall/comp_ff_of_prereq_RHEL74.pl.base
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/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_RHEL76.pl b/CommonInstall/comp_ff_of_prereq_RHEL84.pl
similarity index 98%
rename from CommonInstall/comp_ff_of_prereq_RHEL76.pl
rename to CommonInstall/comp_ff_of_prereq_RHEL84.pl
index 49d4bd11..b7dc68f1 100644
--- a/CommonInstall/comp_ff_of_prereq_RHEL76.pl
+++ b/CommonInstall/comp_ff_of_prereq_RHEL84.pl
@@ -2,6 +2,7 @@
## BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015-2020, Intel Corporation
+# Copyright (c) 2020, Cornelis Networks, Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
diff --git a/CommonInstall/comp_ff_of_prereq_RHEL75.pl b/CommonInstall/comp_ff_of_prereq_RHEL84.pl.base
similarity index 98%
rename from CommonInstall/comp_ff_of_prereq_RHEL75.pl
rename to CommonInstall/comp_ff_of_prereq_RHEL84.pl.base
index 49d4bd11..b7dc68f1 100644
--- a/CommonInstall/comp_ff_of_prereq_RHEL75.pl
+++ b/CommonInstall/comp_ff_of_prereq_RHEL84.pl.base
@@ -2,6 +2,7 @@
## BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015-2020, Intel Corporation
+# Copyright (c) 2020, Cornelis Networks, Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
diff --git a/CommonInstall/comp_ff_of_prereq_RHEL76.pl.base b/CommonInstall/comp_ff_of_prereq_RHEL85.pl
similarity index 98%
rename from CommonInstall/comp_ff_of_prereq_RHEL76.pl.base
rename to CommonInstall/comp_ff_of_prereq_RHEL85.pl
index 49d4bd11..b7dc68f1 100644
--- a/CommonInstall/comp_ff_of_prereq_RHEL76.pl.base
+++ b/CommonInstall/comp_ff_of_prereq_RHEL85.pl
@@ -2,6 +2,7 @@
## BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015-2020, Intel Corporation
+# Copyright (c) 2020, Cornelis Networks, Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
diff --git a/CommonInstall/comp_ff_of_prereq_RHEL75.pl.base b/CommonInstall/comp_ff_of_prereq_RHEL85.pl.base
similarity index 98%
rename from CommonInstall/comp_ff_of_prereq_RHEL75.pl.base
rename to CommonInstall/comp_ff_of_prereq_RHEL85.pl.base
index 49d4bd11..b7dc68f1 100644
--- a/CommonInstall/comp_ff_of_prereq_RHEL75.pl.base
+++ b/CommonInstall/comp_ff_of_prereq_RHEL85.pl.base
@@ -2,6 +2,7 @@
## BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015-2020, Intel Corporation
+# Copyright (c) 2020, Cornelis Networks, Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
diff --git a/CommonInstall/comp_ff_of_prereq_SLES122.pl b/CommonInstall/comp_ff_of_prereq_SLES153.pl
similarity index 93%
rename from CommonInstall/comp_ff_of_prereq_SLES122.pl
rename to CommonInstall/comp_ff_of_prereq_SLES153.pl
index 0b0e76d0..114fb4d5 100644
--- a/CommonInstall/comp_ff_of_prereq_SLES122.pl
+++ b/CommonInstall/comp_ff_of_prereq_SLES153.pl
@@ -2,6 +2,7 @@
## BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015-2020, Intel Corporation
+# Copyright (c) 2020-2021, Cornelis Networks
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
@@ -46,7 +47,6 @@
"libibmad5",
"libibumad3",
"libibverbs1",
- "libhfi1verbs-rdmav2 ",
"libstdc++6",
"ibacm",
);
@@ -63,13 +63,15 @@
"libibmad5",
"libibumad3",
"libibverbs1",
- "libhfi1verbs-rdmav2",
- "libncurses5",
- "libopenssl1_0_0",
+ "libncurses6",
+ "libopenssl1_1",
"libstdc++6",
"libz1",
"bc",
- "rdma",
+ "rdma-core",
+ "rdma-ndd",
+ "qperf",
+ "perftest",
);
$comp_prereq_hash{'fastfabric_prereq'} = \@fastfabric_prereq;
@@ -77,13 +79,13 @@
"bash",
"glibc",
"libgcc_s1",
- "libibumad-devel",
"libibumad3",
- "libibverbs-devel",
"libibverbs1",
"libopenssl-devel",
- "libopenssl1_0_0",
+ "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_SLES122.pl.base b/CommonInstall/comp_ff_of_prereq_SLES153.pl.base
similarity index 93%
rename from CommonInstall/comp_ff_of_prereq_SLES122.pl.base
rename to CommonInstall/comp_ff_of_prereq_SLES153.pl.base
index 0b0e76d0..114fb4d5 100644
--- a/CommonInstall/comp_ff_of_prereq_SLES122.pl.base
+++ b/CommonInstall/comp_ff_of_prereq_SLES153.pl.base
@@ -2,6 +2,7 @@
## BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015-2020, Intel Corporation
+# Copyright (c) 2020-2021, Cornelis Networks
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
@@ -46,7 +47,6 @@ my @oftools_prereq = (
"libibmad5",
"libibumad3",
"libibverbs1",
- "libhfi1verbs-rdmav2 ",
"libstdc++6",
"ibacm",
);
@@ -63,13 +63,15 @@ my @fastfabric_prereq = (
"libibmad5",
"libibumad3",
"libibverbs1",
- "libhfi1verbs-rdmav2",
- "libncurses5",
- "libopenssl1_0_0",
+ "libncurses6",
+ "libopenssl1_1",
"libstdc++6",
"libz1",
"bc",
- "rdma",
+ "rdma-core",
+ "rdma-ndd",
+ "qperf",
+ "perftest",
);
$comp_prereq_hash{'fastfabric_prereq'} = \@fastfabric_prereq;
@@ -77,13 +79,13 @@ my @opamgt_sdk_prereq = (
"bash",
"glibc",
"libgcc_s1",
- "libibumad-devel",
"libibumad3",
- "libibverbs-devel",
"libibverbs1",
"libopenssl-devel",
- "libopenssl1_0_0",
+ "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_RHEL73.pl b/CommonInstall/comp_fm_prereq_RHEL73.pl
deleted file mode 100644
index fb94df1f..00000000
--- a/CommonInstall/comp_fm_prereq_RHEL73.pl
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/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",
- "libibmad",
- "libibumad",
- "libibverbs",
- "libhfi1",
- "openssl-libs",
- "rdma",
- "systemd",
- "zlib",
-);
-$comp_prereq_hash{'opafm_prereq'} = \@opafm_prereq;
-
diff --git a/CommonInstall/comp_fm_prereq_RHEL73.pl.base b/CommonInstall/comp_fm_prereq_RHEL73.pl.base
deleted file mode 100644
index fb94df1f..00000000
--- a/CommonInstall/comp_fm_prereq_RHEL73.pl.base
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/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",
- "libibmad",
- "libibumad",
- "libibverbs",
- "libhfi1",
- "openssl-libs",
- "rdma",
- "systemd",
- "zlib",
-);
-$comp_prereq_hash{'opafm_prereq'} = \@opafm_prereq;
-
diff --git a/CommonInstall/comp_fm_prereq_RHEL74.pl b/CommonInstall/comp_fm_prereq_RHEL74.pl
deleted file mode 100644
index 63650196..00000000
--- a/CommonInstall/comp_fm_prereq_RHEL74.pl
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/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_RHEL74.pl.base b/CommonInstall/comp_fm_prereq_RHEL74.pl.base
deleted file mode 100644
index 63650196..00000000
--- a/CommonInstall/comp_fm_prereq_RHEL74.pl.base
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/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_RHEL76.pl b/CommonInstall/comp_fm_prereq_RHEL76.pl
deleted file mode 100644
index bb834773..00000000
--- a/CommonInstall/comp_fm_prereq_RHEL76.pl
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/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_RHEL76.pl.base b/CommonInstall/comp_fm_prereq_RHEL76.pl.base
deleted file mode 100644
index bb834773..00000000
--- a/CommonInstall/comp_fm_prereq_RHEL76.pl.base
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/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_RHEL72.pl b/CommonInstall/comp_fm_prereq_RHEL84.pl
similarity index 97%
rename from CommonInstall/comp_fm_prereq_RHEL72.pl
rename to CommonInstall/comp_fm_prereq_RHEL84.pl
index add8bfbe..02e12bb0 100644
--- a/CommonInstall/comp_fm_prereq_RHEL72.pl
+++ b/CommonInstall/comp_fm_prereq_RHEL84.pl
@@ -2,6 +2,7 @@
## BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015-2020, Intel Corporation
+# Copyright (c) 2020, Cornelis Networks, Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
@@ -45,7 +46,7 @@
"libibumad",
"libibverbs",
"openssl-libs",
- "rdma",
+ "rdma-core",
"systemd",
"zlib",
);
diff --git a/CommonInstall/comp_fm_prereq_RHEL72.pl.base b/CommonInstall/comp_fm_prereq_RHEL84.pl.base
similarity index 97%
rename from CommonInstall/comp_fm_prereq_RHEL72.pl.base
rename to CommonInstall/comp_fm_prereq_RHEL84.pl.base
index add8bfbe..02e12bb0 100644
--- a/CommonInstall/comp_fm_prereq_RHEL72.pl.base
+++ b/CommonInstall/comp_fm_prereq_RHEL84.pl.base
@@ -2,6 +2,7 @@
## BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015-2020, Intel Corporation
+# Copyright (c) 2020, Cornelis Networks, Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
@@ -45,7 +46,7 @@ my @opafm_prereq = (
"libibumad",
"libibverbs",
"openssl-libs",
- "rdma",
+ "rdma-core",
"systemd",
"zlib",
);
diff --git a/CommonInstall/comp_fm_prereq_RHEL75.pl b/CommonInstall/comp_fm_prereq_RHEL85.pl
similarity index 92%
rename from CommonInstall/comp_fm_prereq_RHEL75.pl
rename to CommonInstall/comp_fm_prereq_RHEL85.pl
index bb834773..02e12bb0 100644
--- a/CommonInstall/comp_fm_prereq_RHEL75.pl
+++ b/CommonInstall/comp_fm_prereq_RHEL85.pl
@@ -2,6 +2,7 @@
## BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015-2020, Intel Corporation
+# Copyright (c) 2020, Cornelis Networks, Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
@@ -39,15 +40,14 @@
#
#Installation Prequisites array for opafm
my @opafm_prereq = (
- "bash",
- "expat",
- "glibc",
- "libibumad",
- "libibverbs",
- "openssl-libs",
- "rdma-core",
- "systemd",
- "zlib",
+ "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_RHEL75.pl.base b/CommonInstall/comp_fm_prereq_RHEL85.pl.base
similarity index 92%
rename from CommonInstall/comp_fm_prereq_RHEL75.pl.base
rename to CommonInstall/comp_fm_prereq_RHEL85.pl.base
index bb834773..02e12bb0 100644
--- a/CommonInstall/comp_fm_prereq_RHEL75.pl.base
+++ b/CommonInstall/comp_fm_prereq_RHEL85.pl.base
@@ -2,6 +2,7 @@
## BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015-2020, Intel Corporation
+# Copyright (c) 2020, Cornelis Networks, Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
@@ -39,15 +40,14 @@
#
#Installation Prequisites array for opafm
my @opafm_prereq = (
- "bash",
- "expat",
- "glibc",
- "libibumad",
- "libibverbs",
- "openssl-libs",
- "rdma-core",
- "systemd",
- "zlib",
+ "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_SLES153.pl
similarity index 95%
rename from CommonInstall/comp_fm_prereq_SLES122.pl
rename to CommonInstall/comp_fm_prereq_SLES153.pl
index f183d290..7f0a687d 100644
--- a/CommonInstall/comp_fm_prereq_SLES122.pl
+++ b/CommonInstall/comp_fm_prereq_SLES153.pl
@@ -2,6 +2,7 @@
## BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015-2020, Intel Corporation
+# Copyright (c) 2020-2021, Cornelis Networks
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
@@ -41,14 +42,14 @@
my @opafm_prereq = (
"glibc",
"bash",
- "rdma",
+ "rdma-core",
+ "rdma-ndd",
"systemd",
"libexpat1",
"libibmad5",
"libibumad3",
"libibverbs1",
- "libhfi1verbs-rdmav2",
- "libopenssl1_0_0",
+ "libopenssl1_1",
"libz1",
);
$comp_prereq_hash{'opafm_prereq'} = \@opafm_prereq;
diff --git a/CommonInstall/comp_fm_prereq_SLES122.pl.base b/CommonInstall/comp_fm_prereq_SLES153.pl.base
similarity index 95%
rename from CommonInstall/comp_fm_prereq_SLES122.pl.base
rename to CommonInstall/comp_fm_prereq_SLES153.pl.base
index f183d290..7f0a687d 100644
--- a/CommonInstall/comp_fm_prereq_SLES122.pl.base
+++ b/CommonInstall/comp_fm_prereq_SLES153.pl.base
@@ -2,6 +2,7 @@
## BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015-2020, Intel Corporation
+# Copyright (c) 2020-2021, Cornelis Networks
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
@@ -41,14 +42,14 @@
my @opafm_prereq = (
"glibc",
"bash",
- "rdma",
+ "rdma-core",
+ "rdma-ndd",
"systemd",
"libexpat1",
"libibmad5",
"libibumad3",
"libibverbs1",
- "libhfi1verbs-rdmav2",
- "libopenssl1_0_0",
+ "libopenssl1_1",
"libz1",
);
$comp_prereq_hash{'opafm_prereq'} = \@opafm_prereq;
diff --git a/CommonInstall/main_omnipathwrap_delta.pl b/CommonInstall/main_omnipathwrap_delta.pl
index a38a003f..932a42c3 100644
--- a/CommonInstall/main_omnipathwrap_delta.pl
+++ b/CommonInstall/main_omnipathwrap_delta.pl
@@ -2,7 +2,7 @@
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015-2020, Intel Corporation
-# Copyright (c) 2020, Cornelis Networks, Inc.
+# Copyright (c) 2020-2021, Cornelis Networks
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
@@ -80,6 +80,8 @@
@OmniPathAllComponents );
my @Components_sles15_sp2 = ( "opa_stack",
@OmniPathAllComponents );
+my @Components_sles15_sp3 = ( "opa_stack",
+ @OmniPathAllComponents );
my @Components_rhel74 = ( "opa_stack", "mpi_selector",
@OmniPathAllComponents );
my @Components_rhel75 = ( "opa_stack", "mpi_selector",
@@ -98,6 +100,10 @@
@OmniPathAllComponents );
my @Components_rhel83 = ( "opa_stack", "mpi_selector",
@OmniPathAllComponents );
+my @Components_rhel84 = ( "opa_stack", "mpi_selector",
+ @OmniPathAllComponents );
+my @Components_rhel85 = ( "opa_stack", "mpi_selector",
+ @OmniPathAllComponents );
@Components = ( );
@@ -209,7 +215,7 @@
},
"oftools" => { Name => "OPA Tools",
DefaultInstall => $State_Install,
- SrcDir => file_glob("./IntelOPA-Tools*.*"),
+ SrcDir => file_glob("./CornelisOPX-Tools*.*"),
PreReq => " opa_stack ", CoReq => " opa_stack ",
Hidden => 0, Disabled => 0, IsOFA => 0,
KernelRpms => [ ],
@@ -224,7 +230,7 @@
},
"mpi_selector" => { Name => "MPI selector",
DefaultInstall => $State_Install,
- SrcDir => file_glob("./IntelOPA-OFA_DELTA.*"),
+ SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"),
PreReq => " opa_stack ", CoReq => "",
Hidden => 1, Disabled => 0, IsOFA => 1,
KernelRpms => [ ],
@@ -239,7 +245,7 @@
},
"fastfabric" => { Name => "FastFabric",
DefaultInstall => $State_Install,
- SrcDir => file_glob("./IntelOPA-Tools*.*"),
+ SrcDir => file_glob("./CornelisOPX-Tools*.*"),
PreReq => " opa_stack oftools ", CoReq => "",
Hidden => 0, Disabled => 0, IsOFA => 0,
KernelRpms => [ ],
@@ -255,7 +261,7 @@
# TBD - only a startup script, should act like a subcomponent only
"delta_ipoib" => { Name => "OFA IP over IB",
DefaultInstall => $State_Install,
- SrcDir => file_glob("./IntelOPA-OFA_DELTA.*"),
+ SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"),
PreReq => " opa_stack ", CoReq => "",
Hidden => 0, Disabled => 0, IsOFA => 1,
KernelRpms => [ ],
@@ -435,7 +441,7 @@
},
"opafm" => { Name => "OPA FM",
DefaultInstall => $State_Install,
- SrcDir => file_glob("./IntelOPA-FM.*"),
+ SrcDir => file_glob("./CornelisOPX-FM.*"),
PreReq => " opa_stack ", CoReq => "",
Hidden => 0, Disabled => 0, IsOFA => 0,
KernelRpms => [ ],
@@ -451,7 +457,7 @@
},
"opamgt_sdk" => { Name => "OPA Management SDK",
DefaultInstall => $State_Install,
- SrcDir => file_glob("./IntelOPA-Tools*.*"),
+ SrcDir => file_glob("./CornelisOPX-Tools*.*"),
PreReq => " opa_stack ", CoReq => "",
Hidden => 0, Disabled => 0, IsOFA => 0,
KernelRpms => [ ],
@@ -466,7 +472,7 @@
},
"delta_debug" => { Name => "OFA Debug Info",
DefaultInstall => $State_DoNotInstall,
- SrcDir => file_glob("./IntelOPA-OFA_DELTA.*"),
+ SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"),
PreReq => " opa_stack ", CoReq => "",
Hidden => 0, Disabled => 0, IsOFA => 1,
KernelRpms => [ ],
@@ -539,7 +545,7 @@
my %opa_stack_rhel72_comp_info = (
"opa_stack" => { Name => "OFA OPA Stack",
DefaultInstall => $State_Install,
- SrcDir => file_glob("./IntelOPA-OFA_DELTA.*"),
+ SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"),
PreReq => "", CoReq => " oftools ",
# TBD - HasFirmware - FW update
Hidden => 0, Disabled => 0, IsOFA => 1,
@@ -565,7 +571,7 @@
my %opa_stack_rhel73_comp_info = (
"opa_stack" => { Name => "OFA OPA Stack",
DefaultInstall => $State_Install,
- SrcDir => file_glob("./IntelOPA-OFA_DELTA.*"),
+ SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"),
PreReq => "", CoReq => " oftools ",
# TBD - HasFirmware - FW update
Hidden => 0, Disabled => 0, IsOFA => 1,
@@ -591,7 +597,7 @@
my %opa_stack_rhel_comp_info = (
"opa_stack" => { Name => "OFA OPA Stack",
DefaultInstall => $State_Install,
- SrcDir => file_glob("./IntelOPA-OFA_DELTA.*"),
+ SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"),
PreReq => "", CoReq => " oftools ",
# TBD - HasFirmware - FW update
Hidden => 0, Disabled => 0, IsOFA => 1,
@@ -617,7 +623,7 @@
my %opa_stack_rhel74_hfi2_comp_info = (
"opa_stack" => { Name => "OFA OPA Stack",
DefaultInstall => $State_Install,
- SrcDir => file_glob("./IntelOPA-OFA_DELTA.*"),
+ SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"),
PreReq => "", CoReq => " oftools ",
# TBD - HasFirmware - FW update
Hidden => 0, Disabled => 0, IsOFA => 1,
@@ -643,7 +649,7 @@
my %opa_stack_sles12_sp2_comp_info = (
"opa_stack" => { Name => "OFA OPA Stack",
DefaultInstall => $State_Install,
- SrcDir => file_glob("./IntelOPA-OFA_DELTA.*"),
+ SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"),
PreReq => "", CoReq => " oftools ",
# TBD - HasFirmware - FW update
Hidden => 0, Disabled => 0, IsOFA => 1,
@@ -667,7 +673,7 @@
my %opa_stack_sles12_sp3_comp_info = (
"opa_stack" => { Name => "OFA OPA Stack",
DefaultInstall => $State_Install,
- SrcDir => file_glob("./IntelOPA-OFA_DELTA.*"),
+ SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"),
PreReq => "", CoReq => " oftools ",
# TBD - HasFirmware - FW update
Hidden => 0, Disabled => 0, IsOFA => 1,
@@ -692,7 +698,7 @@
my %opa_stack_sles12_sp4_comp_info = (
"opa_stack" => { Name => "OFA OPA Stack",
DefaultInstall => $State_Install,
- SrcDir => file_glob("./IntelOPA-OFA_DELTA.*"),
+ SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"),
PreReq => "", CoReq => " oftools ",
Hidden => 0, Disabled => 0, IsOFA => 1,
KernelRpms => [ "ifs-kernel-updates-kmp-default" ],
@@ -712,7 +718,7 @@
my %opa_stack_sles12_sp5_comp_info = (
"opa_stack" => { Name => "OFA OPA Stack",
DefaultInstall => $State_Install,
- SrcDir => file_glob("./IntelOPA-OFA_DELTA.*"),
+ SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"),
PreReq => "", CoReq => " oftools ",
Hidden => 0, Disabled => 0, IsOFA => 1,
KernelRpms => [ "ifs-kernel-updates-kmp-default" ],
@@ -732,7 +738,7 @@
my %opa_stack_sles15_comp_info = (
"opa_stack" => { Name => "OFA OPA Stack",
DefaultInstall => $State_Install,
- SrcDir => file_glob("./IntelOPA-OFA_DELTA.*"),
+ SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"),
PreReq => "", CoReq => " oftools ",
# TBD - HasFirmware - FW update
Hidden => 0, Disabled => 0, IsOFA => 1,
@@ -759,7 +765,7 @@
my %ibacm_older_comp_info = (
"ibacm" => { Name => "OFA IBACM",
DefaultInstall => $State_Install,
- SrcDir => file_glob("./IntelOPA-OFA_DELTA.*"),
+ SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"),
PreReq => " opa_stack ", CoReq => "",
Hidden => 0, Disabled => 0, IsOFA => 1,
KernelRpms => [ ],
@@ -793,9 +799,9 @@
# one of these intel_hfi comp_info gets appended to ComponentInfo
# for RHEL72 which lacks libhfi1
my %intel_hfi_older_comp_info = (
- "intel_hfi" => { Name => "Intel HFI Components",
+ "intel_hfi" => { Name => "Cornelis HFI Components",
DefaultInstall => $State_Install,
- SrcDir => file_glob("./IntelOPA-OFA_DELTA.*"),
+ SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"),
PreReq => " opa_stack ", CoReq => " oftools ",
# TBD - HasFirmware - FW update
Hidden => 0, Disabled => 0, IsOFA => 1,
@@ -824,9 +830,9 @@
);
# for RHEL73, SLES12.2 and other newer distros which include libhfi1
my %intel_hfi_comp_info = (
- "intel_hfi" => { Name => "Intel HFI Components",
+ "intel_hfi" => { Name => "Cornelis HFI Components",
DefaultInstall => $State_Install,
- SrcDir => file_glob("./IntelOPA-OFA_DELTA.*"),
+ SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"),
PreReq => " opa_stack ", CoReq => " oftools ",
# TBD - HasFirmware - FW update
Hidden => 0, Disabled => 0, IsOFA => 1,
@@ -856,9 +862,9 @@
#
# for RHEL8, which does not currently support opa_stack and does not require libfabric-psm
my %intel_hfi_rhel8_comp_info = (
- "intel_hfi" => { Name => "Intel HFI Components",
+ "intel_hfi" => { Name => "Cornelis HFI Components",
DefaultInstall => $State_Install,
- SrcDir => file_glob("./IntelOPA-OFA_DELTA.*"),
+ SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"),
PreReq => " opa_stack ", CoReq => " oftools ",
# TBD - HasFirmware - FW update
Hidden => 0, Disabled => 0, IsOFA => 1,
@@ -886,9 +892,9 @@
);
my %intel_hfi_rhel81_comp_info = (
- "intel_hfi" => { Name => "Intel HFI Components",
+ "intel_hfi" => { Name => "Cornelis HFI Components",
DefaultInstall => $State_Install,
- SrcDir => file_glob("./IntelOPA-OFA_DELTA.*"),
+ SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"),
PreReq => " opa_stack ", CoReq => " oftools ",
# TBD - HasFirmware - FW update
Hidden => 0, Disabled => 0, IsOFA => 1,
@@ -916,9 +922,9 @@
);
my %intel_hfi_rhel82_comp_info = (
- "intel_hfi" => { Name => "Intel HFI Components",
+ "intel_hfi" => { Name => "Cornelis HFI Components",
DefaultInstall => $State_Install,
- SrcDir => file_glob("./IntelOPA-OFA_DELTA.*"),
+ SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"),
PreReq => " opa_stack ", CoReq => " oftools ",
# TBD - HasFirmware - FW update
Hidden => 0, Disabled => 0, IsOFA => 1,
@@ -946,9 +952,69 @@
);
my %intel_hfi_rhel83_comp_info = (
- "intel_hfi" => { Name => "Intel HFI Components",
+ "intel_hfi" => { Name => "Cornelis HFI Components",
DefaultInstall => $State_Install,
- SrcDir => file_glob("./IntelOPA-OFA_DELTA.*"),
+ SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"),
+ PreReq => " opa_stack ", CoReq => " oftools ",
+ # TBD - HasFirmware - FW update
+ Hidden => 0, Disabled => 0, IsOFA => 1,
+ KernelRpms => [ ],
+ FirmwareRpms => [
+ "hfi1-firmware", "hfi1-firmware_debug"
+ ],
+ UserRpms => [ #"libhfi1", "libhfi1-static",
+ "libpsm2",
+ "libpsm2-devel", "libpsm2-compat",
+ "libfabric", "libfabric-devel",
+ "libfabric-psm2", "libfabric-verbs",
+ "hfi1-diagtools-sw", "hfidiags",
+ ],
+ DebugRpms => [ #"hfi1_debuginfo",
+ "hfi1-diagtools-sw-debuginfo",
+ "libpsm2-debuginfo", #"libhfi1-debuginfo"
+ ],
+ HasStart => 1, HasFirmware => 0, DefaultStart => 1,
+ StartPreReq => " opa_stack ",
+ StartComponents => [ "intel_hfi" ],
+ StartupScript => "",
+ StartupParams => [ ]
+ },
+);
+
+my %intel_hfi_rhel84_comp_info = (
+ "intel_hfi" => { Name => "Cornelis HFI Components",
+ DefaultInstall => $State_Install,
+ SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"),
+ PreReq => " opa_stack ", CoReq => " oftools ",
+ # TBD - HasFirmware - FW update
+ Hidden => 0, Disabled => 0, IsOFA => 1,
+ KernelRpms => [ ],
+ FirmwareRpms => [
+ "hfi1-firmware", "hfi1-firmware_debug"
+ ],
+ UserRpms => [ #"libhfi1", "libhfi1-static",
+ "libpsm2",
+ "libpsm2-devel", "libpsm2-compat",
+ "libfabric", "libfabric-devel",
+ "libfabric-psm2", "libfabric-verbs",
+ "hfi1-diagtools-sw", "hfidiags",
+ ],
+ DebugRpms => [ #"hfi1_debuginfo",
+ "hfi1-diagtools-sw-debuginfo",
+ "libpsm2-debuginfo", #"libhfi1-debuginfo"
+ ],
+ HasStart => 1, HasFirmware => 0, DefaultStart => 1,
+ StartPreReq => " opa_stack ",
+ StartComponents => [ "intel_hfi" ],
+ StartupScript => "",
+ StartupParams => [ ]
+ },
+);
+
+my %intel_hfi_rhel85_comp_info = (
+ "intel_hfi" => { Name => "Cornelis HFI Components",
+ DefaultInstall => $State_Install,
+ SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"),
PreReq => " opa_stack ", CoReq => " oftools ",
# TBD - HasFirmware - FW update
Hidden => 0, Disabled => 0, IsOFA => 1,
@@ -977,9 +1043,9 @@
# For SLES12sp3 that has different name for libpsm2
my %intel_hfi_sles123_comp_info = (
- "intel_hfi" => { Name => "Intel HFI Components",
+ "intel_hfi" => { Name => "Cornelis HFI Components",
DefaultInstall => $State_Install,
- SrcDir => file_glob("./IntelOPA-OFA_DELTA.*"),
+ SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"),
PreReq => " opa_stack ", CoReq => " oftools ",
# TBD - HasFirmware - FW update
Hidden => 0, Disabled => 0, IsOFA => 1,
@@ -1008,9 +1074,9 @@
);
my %intel_hfi_sles124_comp_info = (
- "intel_hfi" => { Name => "Intel HFI Components",
+ "intel_hfi" => { Name => "Cornelis HFI Components",
DefaultInstall => $State_Install,
- SrcDir => file_glob("./IntelOPA-OFA_DELTA.*"),
+ SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"),
PreReq => " opa_stack ", CoReq => " oftools ",
Hidden => 0, Disabled => 0, IsOFA => 1,
KernelRpms => [ ],
@@ -1036,9 +1102,9 @@
);
my %intel_hfi_sles125_comp_info = (
- "intel_hfi" => { Name => "Intel HFI Components",
+ "intel_hfi" => { Name => "Cornelis HFI Components",
DefaultInstall => $State_Install,
- SrcDir => file_glob("./IntelOPA-OFA_DELTA.*"),
+ SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"),
PreReq => " opa_stack ", CoReq => " oftools ",
Hidden => 0, Disabled => 0, IsOFA => 1,
KernelRpms => [ ],
@@ -1065,9 +1131,9 @@
# For SLES15.x that has different name for libpsm2
my %intel_hfi_sles15_comp_info = (
- "intel_hfi" => { Name => "Intel HFI Components",
+ "intel_hfi" => { Name => "Cornelis HFI Components",
DefaultInstall => $State_Install,
- SrcDir => file_glob("./IntelOPA-OFA_DELTA.*"),
+ SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"),
PreReq => " opa_stack ", CoReq => " oftools ",
# TBD - HasFirmware - FW update
Hidden => 0, Disabled => 0, IsOFA => 1,
@@ -1097,9 +1163,9 @@
# for RHEL74 HFI2
my %intel_hfi__rhel74_hfi2_comp_info = (
- "intel_hfi" => { Name => "Intel HFI Components",
+ "intel_hfi" => { Name => "Cornelis HFI Components",
DefaultInstall => $State_Install,
- SrcDir => file_glob("./IntelOPA-OFA_DELTA.*"),
+ SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"),
PreReq => " opa_stack ", CoReq => " oftools ",
# TBD - HasFirmware - FW update
Hidden => 0, Disabled => 0, IsOFA => 1,
@@ -1132,7 +1198,7 @@
my %opa_stack_dev_rhel72_comp_info = (
"opa_stack_dev" => { Name => "OFA OPA Development",
DefaultInstall => $State_Install,
- SrcDir => file_glob("./IntelOPA-OFA_DELTA.*"),
+ SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"),
PreReq => " opa_stack ", CoReq => "",
Hidden => 0, Disabled => 0, IsOFA => 1,
KernelRpms => [ "ifs-kernel-updates-devel" ],
@@ -1153,7 +1219,7 @@
my %opa_stack_dev_comp_info = (
"opa_stack_dev" => { Name => "OFA OPA Development",
DefaultInstall => $State_Install,
- SrcDir => file_glob("./IntelOPA-OFA_DELTA.*"),
+ SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"),
PreReq => " opa_stack ", CoReq => "",
Hidden => 0, Disabled => 0, IsOFA => 1,
KernelRpms => [ "ifs-kernel-updates-devel" ],
@@ -1353,6 +1419,22 @@ sub init_components
%opa_stack_dev_comp_info,
%opa_stack_rhel_comp_info,
);
+ } elsif ( "$CUR_VENDOR_VER" eq "ES84" ) {
+ @Components = ( @Components_rhel84 );
+ @SubComponents = ( @SubComponents_newer );
+ %ComponentInfo = ( %ComponentInfo, %ibacm_comp_info,
+ %intel_hfi_rhel84_comp_info,
+ %opa_stack_dev_comp_info,
+ %opa_stack_rhel_comp_info,
+ );
+ } elsif ( "$CUR_VENDOR_VER" eq "ES85" ) {
+ @Components = ( @Components_rhel85 );
+ @SubComponents = ( @SubComponents_newer );
+ %ComponentInfo = ( %ComponentInfo, %ibacm_comp_info,
+ %intel_hfi_rhel85_comp_info,
+ %opa_stack_dev_comp_info,
+ %opa_stack_rhel_comp_info,
+ );
} elsif ( "$CUR_VENDOR_VER" eq "ES15" ) {
@Components = ( @Components_sles15 );
@SubComponents = ( @SubComponents_newer );
@@ -1377,6 +1459,14 @@ sub init_components
%opa_stack_dev_comp_info,
%opa_stack_sles15_comp_info,
);
+ } elsif ( "$CUR_VENDOR_VER" eq "ES153" ) {
+ @Components = ( @Components_sles15_sp3 );
+ @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
diff --git a/CommonInstall/overrides_delta.pl b/CommonInstall/overrides_delta.pl
index e009fca6..e142ba5b 100644
--- a/CommonInstall/overrides_delta.pl
+++ b/CommonInstall/overrides_delta.pl
@@ -2,7 +2,7 @@
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015-2020, Intel Corporation
-# Copyright (c) 2020, Cornelis Networks, Inc.
+# Copyright (c) 2020-2021, Cornelis Networks, Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
@@ -99,6 +99,14 @@
"opa_stack_dev",
"delta_ipoib",
"delta_debug", );
+my @delta_Components_rhel84 = ( "opa_stack", "mpi_selector", "intel_hfi",
+ "opa_stack_dev",
+ "delta_ipoib",
+ "delta_debug", );
+my @delta_Components_rhel85 = ( "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",
@@ -111,6 +119,10 @@
"opa_stack_dev",
"delta_ipoib",
"delta_debug", );
+my @delta_Components_sles15_sp3 = ( "opa_stack", "intel_hfi",
+ "opa_stack_dev",
+ "delta_ipoib",
+ "delta_debug", );
@Components = ( );
# RHEL7.2, ibacm is a full component with rpms to install
@@ -153,12 +165,18 @@ ()
@Components = ( @delta_Components_rhel82 );
} elsif ( "$CUR_VENDOR_VER" eq "ES83" ) {
@Components = ( @delta_Components_rhel83 );
+ } elsif ( "$CUR_VENDOR_VER" eq "ES84" ) {
+ @Components = ( @delta_Components_rhel84 );
+ } elsif ( "$CUR_VENDOR_VER" eq "ES85" ) {
+ @Components = ( @delta_Components_rhel85 );
} 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 );
+ } elsif ( "$CUR_VENDOR_VER" eq "ES153" ) {
+ @Components = ( @delta_Components_sles15_sp3 );
} else {
# unsupported OS
@Components = ( );
diff --git a/CommonInstall/util_init.pl b/CommonInstall/util_init.pl
index 7cbd342e..a4852408 100755
--- a/CommonInstall/util_init.pl
+++ b/CommonInstall/util_init.pl
@@ -224,6 +224,14 @@ ($)
} else {
$rval="ES".$1.$2;
}
+ } elsif (!system("grep -qi rocky /etc/redhat-release")) {
+ $rval = `cat /etc/redhat-release | cut -d' ' -f4`;
+ $rval =~ m/(\d+).(\d+)/;
+ if ($2 eq "0") {
+ $rval="ES".$1;
+ } else {
+ $rval="ES".$1.$2;
+ }
}
}
} elsif ($vendor eq "apple") {
@@ -257,6 +265,12 @@ ($)
$rval = `cat /etc/redhat-release`;
$rval =~ m/(\d+).(\d+)/;
$rval="ES".$1;
+ } elsif (!system("grep -qi rocky /etc/redhat-release")) {
+ # Find a number of the form "#.#" and output the portion
+ # to the left of the decimal point.
+ $rval = `cat /etc/redhat-release`;
+ $rval =~ m/(\d+).(\d+)/;
+ $rval="ES".$1.$2;
} elsif (!system("grep -qi enterprise /etc/redhat-release")) {
# Red Hat Enterprise Linux Server release $a.$b (name)
#PR 110926
@@ -304,6 +318,8 @@ ()
$CUR_DISTRO_VENDOR = "redhat";
} elsif ( -s "/etc/centos-release" ) {
$CUR_DISTRO_VENDOR = "redhat";
+ } elsif ( -s "/etc/rocky-release" ) {
+ $CUR_DISTRO_VENDOR = "redhat";
} elsif ( -s "/etc/UnitedLinux-release" ) {
$CUR_DISTRO_VENDOR = "UnitedLinux";
$NETWORK_CONF_DIR = "/etc/sysconfig/network";
@@ -321,12 +337,14 @@ ()
my %distroVendor = (
"rhel" => "redhat",
"centos" => "redhat",
+ "rocky" => "redhat",
"sles" => "SuSE",
"sle_hpc" => "SuSE"
);
my %network_conf_dir = (
"rhel" => $NETWORK_CONF_DIR,
"centos" => $NETWORK_CONF_DIR,
+ "rocky" => $NETWORK_CONF_DIR,
"sles" => "/etc/sysconfig/network",
"sle_hpc" => "/etc/sysconfig/network"
);
@@ -356,6 +374,8 @@ ()
$NETWORK_CONF_DIR = "/etc/sysconfig/network";
} elsif ($CUR_DISTRO_VENDOR eq "centos") {
$CUR_DISTRO_VENDOR = "redhat";
+ } elsif ($CUR_DISTRO_VENDOR eq "rocky") {
+ $CUR_DISTRO_VENDOR = "redhat";
}
}
$CUR_VENDOR_VER = os_vendor_version($CUR_DISTRO_VENDOR);
diff --git a/CommonInstall/util_rpm.pl b/CommonInstall/util_rpm.pl
index 512cfdd1..07016168 100755
--- a/CommonInstall/util_rpm.pl
+++ b/CommonInstall/util_rpm.pl
@@ -727,7 +727,7 @@ ($$)
} 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' || "$CUR_VENDOR_VER" eq 'ES152' ) {
+ 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' || "$CUR_VENDOR_VER" eq 'ES153' ) {
DebugPrint("Checking for Kernel Rpm: ${rpmpath}-${osver}_k*.${cpu}.rpm\n");
$rpmfile = file_glob("${rpmpath}-${osver}_k*.${cpu}.rpm");
} else {
@@ -1006,8 +1006,8 @@ ($)
NormalPrint("kernel-rpm-macros ($last_checked) is required to build $srpm\n");
$err++;
}
- if (! rpm_is_installed("kernel-abi-whitelists", "any") ) {
- NormalPrint("kernel-abi-whitelist ($last_checked) is required to build $srpm\n");
+ if (! rpm_is_installed("kernel-abi-whitelists", "any") && ! rpm_is_installed("kernel-abi-stablelists", "any") ) {
+ NormalPrint("kernel-abi-whitelists or kernel-abi-stablelists ($last_checked) is required to build $srpm\n");
$err++;
}
}
diff --git a/Esm/Makefile.linux b/Esm/Makefile.linux
index f8b3ea27..966b8a13 100644
--- a/Esm/Makefile.linux
+++ b/Esm/Makefile.linux
@@ -1,7 +1,7 @@
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015-2020, Intel Corporation
-# Copyright (c) 2020, Cornelis Networks, Inc.
+# Copyright (c) 2020-2021, Cornelis Networks, Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
@@ -116,21 +116,6 @@ INSTALL_SOURCES = \
$(TL_DIR)/CommonInstall/main_omnipathwrap_delta.pl
COMP_SOURCES = $(TL_DIR)/CommonInstall/comp_qlgc_fm.pl
-ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES72"
- PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_RHEL72.pl
-endif
-ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES73"
- PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_RHEL73.pl
-endif
-ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES74"
- PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_RHEL74.pl
-endif
-ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES75"
- PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_RHEL75.pl
-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
@@ -149,8 +134,11 @@ endif
ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES83"
PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_RHEL83.pl
endif
-ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES122"
- PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_SLES122.pl
+ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES84"
+ PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_RHEL84.pl
+endif
+ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES85"
+ PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_RHEL85.pl
endif
ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES123"
PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_SLES123.pl
@@ -170,6 +158,9 @@ endif
ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES152"
PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_SLES152.pl
endif
+ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES153"
+ PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_SLES153.pl
+endif
# Source files to include in DSP File
@@ -301,14 +292,14 @@ package: fmbuild
mkdir -p $(RELEASE_DIR)
rm -f packaged_files dist_files
cd $(STAGE_DIR) ; \
- dir=`echo IntelOPA-FM.*`; \
- ver=`expr IntelOPA-FM.* : 'IntelOPA-FM.\(.*\)$$'`; \
- rm -rf $(RELEASE_DIR)/IntelOPA-FM.$$ver; \
- mkdir -p $(RELEASE_DIR)/IntelOPA-FM.$$ver ; \
- cp -r $$dir/arch $$dir/distro $$dir/distro_version $$dir/os_id $$dir/README $(RELEASE_DIR)/IntelOPA-FM.$$ver 2>/dev/null; \
- cp -r $$dir/INSTALL $$dir/comp.pl $$dir/Version $(RELEASE_DIR)/IntelOPA-FM.$$ver ; \
- echo "$(RELEASE_DIR)/IntelOPA-FM.$$ver.tgz" >> $(TL_DIR)/packaged_files; \
- echo "$(RELEASE_DIR)/IntelOPA-FM.$$ver.tgz" >> $(TL_DIR)/dist_files; \
+ dir=`echo CornelisOPX-FM.*` ; \
+ ver=`expr CornelisOPX-FM.* : 'CornelisOPX-FM.\(.*\)$$'`; \
+ rm -rf $(RELEASE_DIR)/CornelisOPX-FM.$$ver; \
+ mkdir -p $(RELEASE_DIR)/CornelisOPX-FM.$$ver ; \
+ cp -r $$dir/arch $$dir/distro $$dir/distro_version $$dir/os_id $$dir/README $(RELEASE_DIR)/CornelisOPX-FM.$$ver 2>/dev/null; \
+ cp -r $$dir/INSTALL $$dir/comp.pl $$dir/Version $(RELEASE_DIR)/CornelisOPX-FM.$$ver ; \
+ echo "$(RELEASE_DIR)/CornelisOPX-FM.$$ver.tgz" >> $(TL_DIR)/packaged_files; \
+ echo "$(RELEASE_DIR)/CornelisOPX-FM.$$ver.tgz" >> $(TL_DIR)/dist_files; \
.PHONY: package
diff --git a/Esm/Makerules.project b/Esm/Makerules.project
index 65b3a614..8a41fd47 100755
--- a/Esm/Makerules.project
+++ b/Esm/Makerules.project
@@ -84,9 +84,9 @@ PROJ_SBR_DIR = $(GLOBAL_SBR_DIR)
ifeq "$(RELEASE_TAG)" ""
# only use engineer's name for directory name (omit timestamp part),
# otherwise each partial build goes to a different place
-STAGE_SUB_DIR = IntelOPA-FM-$(BUILD_TARGET_OS_ID).$(shell $(PATCH_ENG_VERSION)|cut -d"." -f1)
+STAGE_SUB_DIR = CornelisOPX-FM-$(BUILD_TARGET_OS_ID).$(shell $(PATCH_ENG_VERSION)|cut -d"." -f1)
else
-STAGE_SUB_DIR = IntelOPA-FM.$(BUILD_TARGET_OS_ID).$(MODULEVERSION)
+STAGE_SUB_DIR = CornelisOPX-FM.$(BUILD_TARGET_OS_ID).$(MODULEVERSION)
endif
# items which we don't plan to package and are side effects, such as
# fastfabric, we put up in STAGE_DIR so
diff --git a/Esm/build.env b/Esm/build.env
index fec03874..3e0c3302 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_11_0_0_574
+export RELEASE_TAG=10_11_1_3_1
export BUILD_CONFIG=${BUILD_CONFIG:-"release"}
export BUILD_WITH_STACK=OPENIB
export LDENVFS=
diff --git a/Esm/build_label b/Esm/build_label
index 414fb0e0..34cd7c25 100644
--- a/Esm/build_label
+++ b/Esm/build_label
@@ -1 +1 @@
-Build of VIEO_HOST 03/29/21 23:41 Tag: VIEO_HOST_LINUX_opa-10_11_10_11_0_0_574
+Build of VIEO_HOST 02/28/22 15:25 Tag: VIEO_HOST_LINUX_opa-10_11_10_11_1_3_1
diff --git a/Esm/get_id_and_versionid.sh b/Esm/get_id_and_versionid.sh
index 09ae69ae..3ea2b4c2 100755
--- a/Esm/get_id_and_versionid.sh
+++ b/Esm/get_id_and_versionid.sh
@@ -55,6 +55,9 @@ else
rval=UnitedLinux
fi
elif [ $rval = 'centos' ]
+ then
+ rval=redhat
+ elif [ $rval = 'rocky' ]
then
rval=redhat
elif [ $rval != 'os' ]
@@ -95,6 +98,10 @@ else
then
# CentOS
rval=`cat /etc/redhat-release | sed -r 's/^.+([[:digit:]])\.([[:digit:]]).+$/\1.\2/'`
+ elif grep -qi rocky /etc/redhat-release
+ then
+ # Rocky
+ rval=`cat /etc/redhat-release | sed -r 's/^.+([[:digit:]])\.([[:digit:]]).+$/\1.\2/'`
elif grep -qi scientific /etc/redhat-release
then
# Scientific Linux.
diff --git a/Esm/ib/src/linux/startup/opafm_src.xml b/Esm/ib/src/linux/startup/opafm_src.xml
index 2087aa53..eaf0b3c7 100644
--- a/Esm/ib/src/linux/startup/opafm_src.xml
+++ b/Esm/ib/src/linux/startup/opafm_src.xml
@@ -797,7 +797,7 @@
-
+
@@ -1036,14 +1036,14 @@
-
+
shortestpath
-
+
@@ -1054,7 +1054,7 @@
-
+
0
@@ -1705,7 +1705,7 @@
-
+
@@ -2074,7 +2074,7 @@
-
+
diff --git a/Esm/ib/src/linux/startup/opafm_src.xml.base b/Esm/ib/src/linux/startup/opafm_src.xml.base
index 2087aa53..eaf0b3c7 100644
--- a/Esm/ib/src/linux/startup/opafm_src.xml.base
+++ b/Esm/ib/src/linux/startup/opafm_src.xml.base
@@ -797,7 +797,7 @@
-
+
@@ -1036,14 +1036,14 @@
-
+
shortestpath
-
+
@@ -1054,7 +1054,7 @@
-
+
0
@@ -1705,7 +1705,7 @@
-
+
@@ -2074,7 +2074,7 @@
-
+
diff --git a/Esm/ib/src/pm/include/pm_topology.h b/Esm/ib/src/pm/include/pm_topology.h
index 9be6961b..30ececb8 100644
--- a/Esm/ib/src/pm/include/pm_topology.h
+++ b/Esm/ib/src/pm/include/pm_topology.h
@@ -1551,7 +1551,7 @@ extern FSTATUS PmClearPortRunningVFCounters(Pm_t *pm, PmPort_t *pmportp, STLVlCo
// compute theoretical limits for each rate
//extern void PM_InitLswfToMBps(void);
// ideally should be static, extern due to split of sweep.c and calc.c
-uint32 s_StaticRateToMBps[IB_STATIC_RATE_MAX+1];
+extern uint32 s_StaticRateToMBps[IB_STATIC_RATE_MAX+1];
// This group of functions accept an index into the pmportp->Groups[]
// caller should search for appropriate entry in array to act on
diff --git a/Esm/ib/src/pm/pm/pm.c b/Esm/ib/src/pm/pm/pm.c
index 4d42ed1d..6857e37a 100644
--- a/Esm/ib/src/pm/pm/pm.c
+++ b/Esm/ib/src/pm/pm/pm.c
@@ -126,9 +126,6 @@ extern Status_t vfi_GetPortGuid(ManagerInfo_t * fp, uint32_t gididx);
#define SID_ASCII_FORMAT "%02x%02x%02x%02x%02x%02x%02x%02x"
static IB_SERVICE_RECORD pmServRer;
-#ifndef __VXWORKS__
-static char msgbuf[256];
-#endif
#if 0
diff --git a/Esm/ib/src/smi/include/sa_l.h b/Esm/ib/src/smi/include/sa_l.h
index d0d63283..c662e25b 100644
--- a/Esm/ib/src/smi/include/sa_l.h
+++ b/Esm/ib/src/smi/include/sa_l.h
@@ -314,7 +314,7 @@ Status_t sa_Authenticate_Path(STL_LID, STL_LID);
Status_t sa_Authenticate_Access(uint32_t, STL_LID, STL_LID, STL_LID);
Status_t sa_Compare_Node_Port_PKeys(Node_t*, Port_t*);
Status_t sa_Compare_Port_PKeys(Port_t*, Port_t*);
-uint32_t saDebugPerf; // control SA performance messages; default is off
+extern uint32_t saDebugPerf; // control SA performance messages; default is off
Status_t sa_data_offset(uint16_t class, uint16_t type);
Status_t sa_create_template_mask(uint16_t, uint64_t);
diff --git a/Esm/ib/src/smi/include/sm_l.h b/Esm/ib/src/smi/include/sm_l.h
index 4d563786..cbcc0c2e 100644
--- a/Esm/ib/src/smi/include/sm_l.h
+++ b/Esm/ib/src/smi/include/sm_l.h
@@ -1127,9 +1127,21 @@ typedef struct _McMember {
uint32_t index; /* Used by OOB mgmt interface to track record */
} McMember_t;
-#define MCMEMBER_STATE_FULL_MEMBER 0x01
-#define MCMEMBER_STATE_NON_MEMBER 0x02
-#define MCMEMBER_STATE_SENDONLY_MEMBER 0x04
+#define MCMEMBER_STATE_FULL_MEMBER 0x01
+#define MCMEMBER_STATE_NON_MEMBER 0x02
+#define MCMEMBER_STATE_SENDONLY_NON_MEMBER 0x04
+#define MCMEMBER_STATE_SENDONLY_FULL_MEMBER 0x08
+
+#define IS_MCMEMBER_STATE_FULL_MEMBER(mcMember) \
+ (((mcMember)->state & MCMEMBER_STATE_FULL_MEMBER) || \
+ ((mcMember)->state & MCMEMBER_STATE_SENDONLY_FULL_MEMBER))
+
+#define IS_MCMEMBER_RECORD_JOIN_FULL_MEMBER(mcmp) \
+ (((mcmp)->JoinFullMember) || ((mcmp)->JoinSendOnlyFullMember))
+
+#define IS_MCMEMBER_RECORD_JOIN_SEND_ONLY(mcMember) \
+ (((mcMember)->record.JoinSendOnlyNonMember) || \
+ ((mcMember)->record.JoinSendOnlyFullMember))
typedef enum {
McGroupBehaviorStrict = 0,
diff --git a/Esm/ib/src/smi/sa/sa_McMemberRecord.c b/Esm/ib/src/smi/sa/sa_McMemberRecord.c
index 2aa99141..9e83d51c 100644
--- a/Esm/ib/src/smi/sa/sa_McMemberRecord.c
+++ b/Esm/ib/src/smi/sa/sa_McMemberRecord.c
@@ -358,7 +358,6 @@ sa_McMemberRecord_Set(Topology_t *topop, Mai_t *maip, uint32_t *records)
mcmp->Reserved = 0;
mcmp->Reserved2 = 0;
mcmp->Reserved3 = 0;
- mcmp->Reserved4 = 0;
mcmp->Reserved5 = 0;
mGid[0] = mcmp->RID.MGID.Type.Global.SubnetPrefix;
@@ -763,7 +762,7 @@ sa_McMemberRecord_Set(Topology_t *topop, Mai_t *maip, uint32_t *records)
goto done;
}
- if (!(mcmp->JoinFullMember)) {
+ if (!(IS_MCMEMBER_RECORD_JOIN_FULL_MEMBER(mcmp))) {
maip->base.status = MAD_STATUS_SA_REQ_INVALID;
IB_LOG_ERROR_FMT_VF( vfp, "sa_McMemberRecord_Set", "Join state of 0x%.2X not full member "
"for NULL GID CREATE request from %s Port %d, PortGUID "FMT_U64", LID 0x%.8X, returning status 0x%.4X",
@@ -890,7 +889,7 @@ sa_McMemberRecord_Set(Topology_t *topop, Mai_t *maip, uint32_t *records)
}
}
- if (!(mcmp->JoinFullMember)) {
+ if (!(IS_MCMEMBER_RECORD_JOIN_FULL_MEMBER(mcmp))) {
maip->base.status = MAD_STATUS_SA_REQ_INVALID;
IB_LOG_ERROR_FMT_VF( vfp, "sa_McMemberRecord_Set", "Join state of 0x%.2X not full member "
"for NEW MGID of "FMT_GID" for CREATE request from %s Port %d, PortGUID "FMT_U64", "
@@ -1147,7 +1146,7 @@ sa_McMemberRecord_Set(Topology_t *topop, Mai_t *maip, uint32_t *records)
if (!(mcMember = sm_find_multicast_member(mcGroup, mcmp->RID.PortGID))) {
McMember_Create(mcGroup, mcMember);
- if (mcmp->JoinFullMember) {
+ if (IS_MCMEMBER_RECORD_JOIN_FULL_MEMBER(mcmp)) {
mcGroup->members_full++;
}
/* new member: sync the group change with standby SMs */
@@ -1155,9 +1154,10 @@ sa_McMemberRecord_Set(Topology_t *topop, Mai_t *maip, uint32_t *records)
} else {
mcmp->JoinFullMember |= mcMember->state & MCMEMBER_STATE_FULL_MEMBER;
mcmp->JoinNonMember |= mcMember->state & MCMEMBER_STATE_NON_MEMBER;
- mcmp->JoinSendOnlyMember |= mcMember->state & MCMEMBER_STATE_SENDONLY_MEMBER;
- if (!(mcMember->state & MCMEMBER_STATE_FULL_MEMBER)) { /* If we were not a full member */
- if (mcmp->JoinFullMember) { /* but are a full member now */
+ mcmp->JoinSendOnlyNonMember |= mcMember->state & MCMEMBER_STATE_SENDONLY_NON_MEMBER;
+ mcmp->JoinSendOnlyFullMember |= mcMember->state & MCMEMBER_STATE_SENDONLY_FULL_MEMBER;
+ if (!(IS_MCMEMBER_STATE_FULL_MEMBER(mcMember))) { /* If we were not a full member */
+ if (IS_MCMEMBER_RECORD_JOIN_FULL_MEMBER(mcmp)) { /* but are a full member now */
mcGroup->members_full++;
}
}
@@ -1334,7 +1334,6 @@ sa_McMemberRecord_Delete(Topology_t *topop, Mai_t *maip, uint32_t *records)
mcmp->Reserved = 0;
mcmp->Reserved2 = 0;
mcmp->Reserved3 = 0;
- mcmp->Reserved4 = 0;
mcmp->Reserved5 = 0;
/* setup return data if successfull */
@@ -1492,7 +1491,7 @@ sa_McMemberRecord_Delete(Topology_t *topop, Mai_t *maip, uint32_t *records)
joinstate = mcMember->state & ~STL_MCMRECORD_GETJOINSTATE(mcmp);
if (joinstate == 0) {
// Delete the multicast member and decrement full member count if needed
- if (mcMember->state & MCMEMBER_STATE_FULL_MEMBER) {
+ if (IS_MCMEMBER_STATE_FULL_MEMBER(mcMember)) {
IB_LOG_VERBOSE_FMT_VF( vfp, "sa_McMemberRecord_Delete", "full mcMember "FMT_U64" left multicast group "
"GID "FMT_GID,
mcMember->portGuid, mcastGid[0], mcastGid[1]);
@@ -1505,8 +1504,8 @@ sa_McMemberRecord_Delete(Topology_t *topop, Mai_t *maip, uint32_t *records)
McMember_Delete(mcGroup, mcMember);
} else {
/* decrement the number of full members in group if member is removing full membership */
- if (mcMember->state & MCMEMBER_STATE_FULL_MEMBER &&
- mcmp->JoinFullMember) {
+ if ((mcMember->state & MCMEMBER_STATE_FULL_MEMBER && mcmp->JoinFullMember) ||
+ (mcMember->state & MCMEMBER_STATE_SENDONLY_FULL_MEMBER && mcmp->JoinSendOnlyFullMember)) {
IB_LOG_VERBOSE_FMT_VF( vfp, "sa_McMemberRecord_Delete",
"full mcMember "FMT_U64" downgrading membership in multicast group "
"GID "FMT_GID,
@@ -1625,7 +1624,6 @@ sa_McMemberRecord_GetTable(Mai_t *maip, uint32_t *records) {
mcMemQuery.Reserved = 0;
mcMemQuery.Reserved2 = 0;
mcMemQuery.Reserved3 = 0;
- mcMemQuery.Reserved4 = 0;
mcMemQuery.Reserved5 = 0;
//
@@ -1697,7 +1695,8 @@ sa_McMemberRecord_GetTable(Mai_t *maip, uint32_t *records) {
data -= sizeof(STL_MCMEMBER_RECORD) + bytes;
BSWAPCOPY_STL_MCMEMBER_RECORD((STL_MCMEMBER_RECORD*)data, &mcMemTemp);
memset(&mcMemTemp.RID.PortGID, 0, sizeof(mcMemTemp.RID.PortGID));
- mcMemTemp.JoinSendOnlyMember = 0;
+ mcMemTemp.JoinSendOnlyFullMember = 0;
+ mcMemTemp.JoinSendOnlyNonMember = 0;
mcMemTemp.JoinNonMember = 0;
mcMemTemp.JoinFullMember = 0;
mcMemTemp.ProxyJoin = 0;
@@ -1834,10 +1833,10 @@ sa_McMemberRecord_IBGetTable(Mai_t *maip, uint32_t *records)
converted.u1.s.HopLimit = mcmp->record.HopLimit;
converted.Scope = mcmp->record.Scope;
converted.JoinFullMember = mcmp->record.JoinFullMember;
- converted.JoinSendOnlyMember = mcmp->record.JoinSendOnlyMember;
+ converted.JoinSendOnlyNonMember = mcmp->record.JoinSendOnlyNonMember;
+ converted.JoinSendOnlyFullMember = mcmp->record.JoinSendOnlyFullMember;
converted.JoinNonMember = mcmp->record.JoinNonMember;
converted.ProxyJoin = mcmp->record.ProxyJoin;
- converted.Reserved = 0;
converted.Reserved2 = 0;
converted.Reserved3[0] = 0;
converted.Reserved3[1] = 0;
@@ -1851,7 +1850,8 @@ sa_McMemberRecord_IBGetTable(Mai_t *maip, uint32_t *records)
BSWAPCOPY_IB_MCMEMBER_RECORD((IB_MCMEMBER_RECORD*)data, &mcMemTemp);
memset(&mcMemTemp.RID.PortGID, 0, sizeof(mcMemTemp.RID.PortGID));
mcMemTemp.JoinFullMember = 0;
- mcMemTemp.JoinSendOnlyMember = 0;
+ mcMemTemp.JoinSendOnlyNonMember = 0;
+ mcMemTemp.JoinSendOnlyFullMember = 0;
mcMemTemp.JoinNonMember = 0;
mcMemTemp.ProxyJoin = 0;
BSWAPCOPY_IB_MCMEMBER_RECORD(&mcMemTemp, (IB_MCMEMBER_RECORD*)data);
@@ -2032,7 +2032,8 @@ Status_t createBroadcastGroup(uint16_t pkey, uint8_t mtu, uint8_t rate, uint8_t
mcmp->Scope = mcGroup->scope;
mcmp->JoinFullMember = mcMember->state & MCMEMBER_STATE_FULL_MEMBER;
mcmp->JoinNonMember = mcMember->state & MCMEMBER_STATE_NON_MEMBER;
- mcmp->JoinSendOnlyMember = mcMember->state & MCMEMBER_STATE_SENDONLY_MEMBER;
+ mcmp->JoinSendOnlyNonMember = mcMember->state & MCMEMBER_STATE_SENDONLY_NON_MEMBER;
+ mcmp->JoinSendOnlyFullMember = mcMember->state & MCMEMBER_STATE_SENDONLY_FULL_MEMBER;
mcmp->ProxyJoin = mcMember->proxy;
emptyBroadcastGroup = 1;
@@ -2361,7 +2362,8 @@ Status_t createMCastGroup(uint64_t* mgid, uint16_t pkey, uint8_t mtu, uint8_t ra
mcmp->Scope = mcGroup->scope;
mcmp->JoinFullMember = mcMember->state & MCMEMBER_STATE_FULL_MEMBER;
mcmp->JoinNonMember = mcMember->state & MCMEMBER_STATE_NON_MEMBER;
- mcmp->JoinSendOnlyMember = mcMember->state & MCMEMBER_STATE_SENDONLY_MEMBER;
+ mcmp->JoinSendOnlyNonMember = mcMember->state & MCMEMBER_STATE_SENDONLY_NON_MEMBER;
+ mcmp->JoinSendOnlyFullMember = mcMember->state & MCMEMBER_STATE_SENDONLY_FULL_MEMBER;
mcmp->ProxyJoin = mcMember->proxy;
emptyBroadcastGroup = 1;
diff --git a/Esm/ib/src/smi/sa/sa_main.c b/Esm/ib/src/smi/sa/sa_main.c
index ccf30175..70be480d 100644
--- a/Esm/ib/src/smi/sa/sa_main.c
+++ b/Esm/ib/src/smi/sa/sa_main.c
@@ -341,6 +341,7 @@ sa_main(void) {
STL_SA_CAPABILITY2_MFTTOP_SUPPORT |
STL_SA_CAPABILITY2_FULL_PORTINFO |
STL_SA_CAPABILITY2_EXT_SUPPORT |
+ STL_SA_CAPABILITY2_SENDONLY_FULL_MEM_SUPPORT |
STL_SA_CAPABILITY2_DGDTRECORD_SUPPORT;
saClassPortInfo.u1.s.RespTimeValue = sm_config.sa_resp_time_n2;
saClassPortInfo.u3.s.RedirectQP = 1;
diff --git a/Esm/ib/src/smi/sm/sm_dbsync_util.c b/Esm/ib/src/smi/sm/sm_dbsync_util.c
index c2b8e9a8..d33237e9 100644
--- a/Esm/ib/src/smi/sm/sm_dbsync_util.c
+++ b/Esm/ib/src/smi/sm/sm_dbsync_util.c
@@ -1117,7 +1117,7 @@ Status_t sm_dbsync_upsmlist(SweepContext_t *sweep_context) {
// delete this member
mcmp = mcMember->next;
- if (!(mcMember->state & MCMEMBER_STATE_FULL_MEMBER)) {
+ if (!(IS_MCMEMBER_STATE_FULL_MEMBER(mcMember))) {
IB_LOG_INFO_FMT(__func__, "Non full mcMember "FMT_U64" of multicast group "
"GID "FMT_U64":"FMT_U64" is no longer in fabric",
mcMember->portGuid, mcastGid[0], mcastGid[1]);
diff --git a/Esm/ib/src/smi/sm/sm_linux_proc.c b/Esm/ib/src/smi/sm/sm_linux_proc.c
index d4e378f0..3750bfdb 100644
--- a/Esm/ib/src/smi/sm/sm_linux_proc.c
+++ b/Esm/ib/src/smi/sm/sm_linux_proc.c
@@ -85,7 +85,7 @@ extern int opterr;
extern int optopt;
extern char *optarg;
extern uint32_t sm_nodaemon;
-extern uint32_t xml_trace;
+extern uint32_t sm_xml_trace;
extern void* getSmXmlParserMemory(uint32_t size, char* info);
extern void freeSmXmlParserMemory(void *address, uint32_t size, char* info);
@@ -177,7 +177,7 @@ main(int argc, char *argv[]) {
while ((c = getopt(argc, argv, Opts)) != -1) {
switch (c) {
case 'D':
- if (!xml_trace)
+ if (!sm_xml_trace)
sm_nodaemon = 0;
break;
case 'n':
diff --git a/Esm/ib/src/smi/sm/sm_main.c b/Esm/ib/src/smi/sm/sm_main.c
index 2f9c2c0a..d0b1178b 100644
--- a/Esm/ib/src/smi/sm/sm_main.c
+++ b/Esm/ib/src/smi/sm/sm_main.c
@@ -120,7 +120,6 @@ uint64_t topology_sema_setTime=0;
uint64_t topology_sema_runTime=0;
uint32_t sm_def_mc_group;
extern uint32_t smDebugPerf; // control SM performance messages; default is off
-extern uint32_t saDebugPerf; // control SA performance messages; default is off
extern uint32_t saDebugRmpp; // control SA RMPP INFO debug messages; default is off
extern uint32_t sm_debug; // SM debug; default is off
extern uint32_t saRmppCheckSum; // control checksum of SA RMPP responses; default is off;
@@ -199,7 +198,7 @@ SmAdaptiveRouting_t sm_adaptiveRouting;
// XML configuration data structure
#ifdef __VXWORKS__
extern FMXmlCompositeConfig_t *xml_config;
-static uint32_t xml_trace = 0;
+static uint32_t sm_xml_trace = 0;
extern SMXmlConfig_t sm_config;
extern FEXmlConfig_t fe_config;
extern PMXmlConfig_t pm_config;
@@ -223,7 +222,7 @@ SMMcastConfig_t sm_mc_config;
SmMcastMlidShare_t sm_mls_config;
SMMcastDefGrpCfg_t sm_mdg_config;
-uint32_t xml_trace = 0;
+uint32_t sm_xml_trace = 0;
extern uint32_t pm_conf_start;
extern uint32_t bm_conf_start;
@@ -852,9 +851,9 @@ Status_t sm_parse_xml_config(void) {
if (xml_config->xmlDebug.xml_sm_debug) {
printf("###########sm_env %s sm_instance %u\n", sm_env, (unsigned int)sm_instance);
- xml_trace = 1;
+ sm_xml_trace = 1;
} else {
- xml_trace = 0;
+ sm_xml_trace = 0;
}
// copy the configurations to local structures and adjust accordingly
@@ -933,7 +932,7 @@ Status_t sm_parse_xml_config(void) {
#ifndef __VXWORKS__ // not required for ESM
// for debugging XML do not deamonize
- if (xml_trace)
+ if (sm_xml_trace)
sm_nodaemon = 1;
#endif // __VXWORKS__
@@ -1058,11 +1057,11 @@ Status_t sm_parse_xml_config(void) {
memset(&sm_adaptiveRouting, 0, sizeof(SmAdaptiveRouting_t));
}
- if (xml_trace) {
+ if (sm_xml_trace) {
smShowConfig(&sm_config, &sm_dpl_config, &sm_mc_config, &sm_mls_config);
}
- if (xml_trace) {
+ if (sm_xml_trace) {
printf("XML - SM old overall_checksum %llu new overall_checksum %llu\n",
(long long unsigned int)sm_overall_checksum, (long long unsigned int)sm_config.overall_checksum);
printf("XML - SM old consistency_checksum %llu new consistency_checksum %llu\n",
@@ -2059,7 +2058,7 @@ sm_main(void)
sm_conf_server_init();
#ifndef __VXWORKS__
- if (xml_trace)
+ if (sm_xml_trace)
fprintf(stdout, "\nSM Initial Config Done\n");
#endif
diff --git a/Esm/ib/src/smi/sm/sm_multicast.c b/Esm/ib/src/smi/sm/sm_multicast.c
index e1b8af47..e0857e3c 100644
--- a/Esm/ib/src/smi/sm/sm_multicast.c
+++ b/Esm/ib/src/smi/sm/sm_multicast.c
@@ -613,7 +613,8 @@ static Status_t sm_createMCastGrp(int vf, uint64_t* mgid, uint16_t pkey, uint8_t
mcmp->Scope = mcGroup->scope;
mcmp->JoinFullMember = mcMember->state & MCMEMBER_STATE_FULL_MEMBER;
mcmp->JoinNonMember = 0;
- mcmp->JoinSendOnlyMember = 0;
+ mcmp->JoinSendOnlyNonMember = 0;
+ mcmp->JoinSendOnlyFullMember = 0;
mcmp->ProxyJoin = mcMember->proxy;
return VSTATUS_OK;
@@ -909,7 +910,7 @@ void sm_add_mcmember_port_masks(void)
if ((mcMember->record.JoinNonMember) ||
(mcMember->record.JoinFullMember)) {
nodep->mft[offset][Mft_Position(portp->portno)] |= Mft_PortmaskBit(portp->portno);
- } else if (mcMember->record.JoinSendOnlyMember) {
+ } else if (IS_MCMEMBER_RECORD_JOIN_SEND_ONLY(mcMember)) {
// mark this switch as having a send only broadcast group member so we do not prune
nodep->hasSendOnlyMember = 1;
}
diff --git a/Esm/ib/src/smi/sm/sm_topology.c b/Esm/ib/src/smi/sm/sm_topology.c
index 42f271d4..d72d6481 100644
--- a/Esm/ib/src/smi/sm/sm_topology.c
+++ b/Esm/ib/src/smi/sm/sm_topology.c
@@ -268,7 +268,6 @@ VirtualFabrics_t *previousVfPtr;
extern VirtualFabrics_t *updatedVirtualFabrics;
#ifndef __VXWORKS__
-extern uint32_t xml_trace;
int sm_peer_quarantined = 0;
#endif
@@ -2741,7 +2740,7 @@ topology_TrapDown(STL_NOTICE * noticep, Topology_t * tp_present, Topology_t * tp
portguid = mcMember->portGuid;
/* Found it, now we must remove it */
- if (!(mcMember->state & MCMEMBER_STATE_FULL_MEMBER)) {
+ if (!(IS_MCMEMBER_STATE_FULL_MEMBER(mcMember))) {
IB_LOG_INFO_FMT(__func__, "Non full mcMember "FMT_U64" of multicast group "
"GID "FMT_GID" is no longer in fabric", portguid, mcastGid[0], mcastGid[1]);
} else {
diff --git a/Esm/ib/src/smi/sm/sm_utility.c b/Esm/ib/src/smi/sm/sm_utility.c
index a98f20c3..2ca6e184 100644
--- a/Esm/ib/src/smi/sm/sm_utility.c
+++ b/Esm/ib/src/smi/sm/sm_utility.c
@@ -86,7 +86,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#endif
extern Lock_t tid_lock;
-uint32_t sm_instance;
+extern uint32_t sm_instance;
//#define TRACK_SEARCHES
uint32_t sm_node_guid_cnt = 0;
diff --git a/Esm/update_opa-fm_spec.sh b/Esm/update_opa-fm_spec.sh
index f054d25f..503e2ef8 100755
--- a/Esm/update_opa-fm_spec.sh
+++ b/Esm/update_opa-fm_spec.sh
@@ -47,7 +47,7 @@ fi
sed -i "s/__RPM_FS/OPA_FEATURE_SET=opa10/g" $to
-if [ "$id" = "rhel" -o "$id" = "centos" ]
+if [ "$id" = "rhel" -o "$id" = "centos" -o "$id" = "rocky" ]
then
GE_7_0=$(echo "$versionid >= 7.0" | bc)
GE_7_4=$(echo "$versionid >= 7.4" | bc)
diff --git a/Esm/update_opa-fm_spec.sh.base b/Esm/update_opa-fm_spec.sh.base
index fc4b3ebb..ba9d351b 100755
--- a/Esm/update_opa-fm_spec.sh.base
+++ b/Esm/update_opa-fm_spec.sh.base
@@ -47,7 +47,7 @@ fi
sed -i "s/__RPM_FS/OPA_FEATURE_SET=opa10/g" $to
-if [ "$id" = "rhel" -o "$id" = "centos" ]
+if [ "$id" = "rhel" -o "$id" = "centos" -o "$id" = "rocky" ]
then
GE_7_0=$(echo "$versionid >= 7.0" | bc)
GE_7_4=$(echo "$versionid >= 7.4" | bc)
diff --git a/IbAccess/Common/Inc/ib_sa_records.h b/IbAccess/Common/Inc/ib_sa_records.h
index 3c8e1d7a..07ad309f 100644
--- a/IbAccess/Common/Inc/ib_sa_records.h
+++ b/IbAccess/Common/Inc/ib_sa_records.h
@@ -536,15 +536,15 @@ typedef struct _IB_MCMEMBER_RECORD {
} u1;
#if CPU_BE
uint8 Scope:4;
- uint8 Reserved:1;
- uint8 JoinSendOnlyMember:1;
+ uint8 JoinSendOnlyFullMember:1;
+ uint8 JoinSendOnlyNonMember:1;
uint8 JoinNonMember:1;
uint8 JoinFullMember:1;
#else
uint8 JoinFullMember:1;
uint8 JoinNonMember:1;
- uint8 JoinSendOnlyMember:1;
- uint8 Reserved:1;
+ uint8 JoinSendOnlyNonMember:1;
+ uint8 JoinSendOnlyFullMember:1;
uint8 Scope:4;
#endif
#if CPU_BE
diff --git a/IbAccess/Common/Inc/stl_sa_priv.h b/IbAccess/Common/Inc/stl_sa_priv.h
index 68e7a695..c9426668 100644
--- a/IbAccess/Common/Inc/stl_sa_priv.h
+++ b/IbAccess/Common/Inc/stl_sa_priv.h
@@ -351,7 +351,8 @@ CONVERT_IB2STL_MCMEMBER_RECORD(IB_MCMEMBER_RECORD *Src, STL_MCMEMBER_RECORD *Des
Dest->HopLimit = Src->u1.s.HopLimit;
Dest->Scope = Src->Scope;
Dest->JoinFullMember = Src->JoinFullMember;
- Dest->JoinSendOnlyMember = Src->JoinSendOnlyMember;
+ Dest->JoinSendOnlyNonMember = Src->JoinSendOnlyNonMember;
+ Dest->JoinSendOnlyFullMember = Src->JoinSendOnlyFullMember;
Dest->JoinNonMember = Src->JoinNonMember;
Dest->ProxyJoin = Src->ProxyJoin;
}
@@ -376,10 +377,10 @@ CONVERT_STL2IB_MCMEMBER_RECORD(STL_MCMEMBER_RECORD *Src, IB_MCMEMBER_RECORD *Des
Dest->u1.s.HopLimit = Src->HopLimit;
Dest->Scope = Src->Scope;
Dest->JoinFullMember = Src->JoinFullMember;
- Dest->JoinSendOnlyMember = Src->JoinSendOnlyMember;
+ Dest->JoinSendOnlyNonMember = Src->JoinSendOnlyNonMember;
+ Dest->JoinSendOnlyFullMember = Src->JoinSendOnlyFullMember;
Dest->JoinNonMember = Src->JoinNonMember;
Dest->ProxyJoin = Src->ProxyJoin;
- Dest->Reserved = 0;
Dest->Reserved2 = 0;
Dest->Reserved3[0] = 0;
Dest->Reserved3[1] = 0;
diff --git a/IbAccess/Common/Inc/stl_sa_types.h b/IbAccess/Common/Inc/stl_sa_types.h
index 8ed9a90a..5fec0106 100644
--- a/IbAccess/Common/Inc/stl_sa_types.h
+++ b/IbAccess/Common/Inc/stl_sa_types.h
@@ -154,12 +154,13 @@ extern "C" {
#define STL_SA_CAPABILITY_PA_SERVICES_SUPPORT 0x8000
/* 32 bit values, lower 27 bits are capabilities*/
-#define STL_SA_CAPABILITY2_QOS_SUPPORT 0x0000002
-#define STL_SA_CAPABILITY2_MFTTOP_SUPPORT 0x0000008
-#define STL_SA_CAPABILITY2_FULL_PORTINFO 0x0000040
-#define STL_SA_CAPABILITY2_EXT_SUPPORT 0x0000080
-#define STL_SA_CAPABILITY2_DGDTRECORD_SUPPORT 0x1000000
-#define STL_SA_CAPABILITY2_SWCOSTRECORD_SUPPORT 0x2000000
+#define STL_SA_CAPABILITY2_QOS_SUPPORT 0x0000002
+#define STL_SA_CAPABILITY2_MFTTOP_SUPPORT 0x0000008
+#define STL_SA_CAPABILITY2_FULL_PORTINFO 0x0000040
+#define STL_SA_CAPABILITY2_EXT_SUPPORT 0x0000080
+#define STL_SA_CAPABILITY2_SENDONLY_FULL_MEM_SUPPORT 0x0001000
+#define STL_SA_CAPABILITY2_DGDTRECORD_SUPPORT 0x1000000
+#define STL_SA_CAPABILITY2_SWCOSTRECORD_SUPPORT 0x2000000
/* SA Capmask Bits to return on IB SA ClassPortInfo */
#define IB_SA_CAPABILITY_MASK(capmask) (capmask & \
@@ -201,11 +202,12 @@ StlSaClassPortInfoCapMask2(char buf[80], uint32 cmask)
if (!cmask) {
snprintf(buf, 80, "-");
} else {
- snprintf(buf, 80, "%s%s%s%s%s%s",
+ snprintf(buf, 80, "%s%s%s%s%s%s%s",
(cmask & STL_SA_CAPABILITY2_QOS_SUPPORT) ? "QoS " : "",
(cmask & STL_SA_CAPABILITY2_MFTTOP_SUPPORT) ? "MFTTop " : "",
(cmask & STL_SA_CAPABILITY2_FULL_PORTINFO) ? "FullPortInfo " : "",
(cmask & STL_SA_CAPABILITY2_EXT_SUPPORT) ? "ExtSpeed " : "",
+ (cmask & STL_SA_CAPABILITY2_SENDONLY_FULL_MEM_SUPPORT) ? "SendOnlyFullMember " : "",
(cmask & STL_SA_CAPABILITY2_DGDTRECORD_SUPPORT) ? "DG/DT " : "",
(cmask & STL_SA_CAPABILITY2_SWCOSTRECORD_SUPPORT) ? "SwCost " : "");
}
@@ -722,8 +724,8 @@ typedef struct {
/* 48 bytes */
IB_BITFIELD5(uint8,
Scope:4,
- Reserved4:1,
- JoinSendOnlyMember:1, // NOTE: Treat these 4 JoinStates as 1 attr.
+ JoinSendOnlyFullMember:1,
+ JoinSendOnlyNonMember:1, // NOTE: Treat these 4 JoinStates as 1 attr.
JoinNonMember:1,
JoinFullMember:1);
@@ -774,7 +776,8 @@ typedef struct {
| STL_MCMEMBER_COMPONENTMASK_JNSTATE \
| STL_MCMEMBER_COMPONENTMASK_PORTGID )
-#define STL_MCMRECORD_GETJOINSTATE(REC) ( (REC)->JoinSendOnlyMember \
+#define STL_MCMRECORD_GETJOINSTATE(REC) ( (REC)->JoinSendOnlyFullMember \
+ | (REC)->JoinSendOnlyNonMember \
| (REC)->JoinNonMember \
| (REC)->JoinFullMember )
diff --git a/IbPrint/sa.c b/IbPrint/sa.c
index d5bb131c..5a943c93 100644
--- a/IbPrint/sa.c
+++ b/IbPrint/sa.c
@@ -277,13 +277,14 @@ void PrintMcMemberRecord(PrintDest_t *dest, int indent, const IB_MCMEMBER_RECORD
indent, "",
pMcMemberRecord->RID.MGID.AsReg64s.H,
pMcMemberRecord->RID.MGID.AsReg64s.L);
- PrintFunc(dest, "%*sPortGid: 0x%016"PRIx64":0x%016"PRIx64" Membership: %s%s%s\n",
+ PrintFunc(dest, "%*sPortGid: 0x%016"PRIx64":0x%016"PRIx64" Membership: %s%s%s%s\n",
indent, "",
pMcMemberRecord->RID.PortGID.Type.Global.SubnetPrefix,
pMcMemberRecord->RID.PortGID.Type.Global.InterfaceID,
pMcMemberRecord->JoinFullMember?"Full ":"",
pMcMemberRecord->JoinNonMember?"Non ":"",
- pMcMemberRecord->JoinSendOnlyMember?"Sendonly ":"");
+ pMcMemberRecord->JoinSendOnlyNonMember?"SendonlyNon ":"",
+ pMcMemberRecord->JoinSendOnlyFullMember?"SendonlyFull ":"");
FormatTimeoutMult(buf, pMcMemberRecord->PktLifeTime);
PrintFunc(dest, "%*sMLID: 0x%08x PKey: 0x%04x Mtu: %5s Rate: %4s PktLifeTime: %s\n",
indent, "",
diff --git a/IbPrint/stl_sa.c b/IbPrint/stl_sa.c
index 84e474d9..5c6ba8ad 100644
--- a/IbPrint/stl_sa.c
+++ b/IbPrint/stl_sa.c
@@ -232,12 +232,13 @@ PrintStlMcMemberRecord(PrintDest_t * dest, int indent,
pMcMemberRecord->RID.MGID.AsReg64s.L);
PrintFunc(dest,
"%*sPortGid: 0x%016" PRIx64 ":0x%016" PRIx64
- " Membership: %s%s%s\n", indent, "",
+ " Membership: %s%s%s%s\n", indent, "",
pMcMemberRecord->RID.PortGID.Type.Global.SubnetPrefix,
pMcMemberRecord->RID.PortGID.Type.Global.InterfaceID,
pMcMemberRecord->JoinFullMember ? "Full " : "",
pMcMemberRecord->JoinNonMember ? "Non " : "",
- pMcMemberRecord->JoinSendOnlyMember ? "Sendonly " : "");
+ pMcMemberRecord->JoinSendOnlyNonMember ? "SendonlyNon " : "",
+ pMcMemberRecord->JoinSendOnlyFullMember ? "SendonlyFull " : "");
FormatTimeoutMult(buf, pMcMemberRecord->PktLifeTime);
PrintFunc(dest,
"%*sMLID: 0x%08x PKey: 0x%04x Mtu: %5s Rate: %4s PktLifeTime: %s\n",
diff --git a/IbaTools/FastFabric/OPTION_MAP b/IbaTools/FastFabric/OPTION_MAP
index 0d60348e..ae233580 100644
--- a/IbaTools/FastFabric/OPTION_MAP
+++ b/IbaTools/FastFabric/OPTION_MAP
@@ -158,7 +158,7 @@ List of command line options used in various Fast Fabric tools
-S point source for trace route
-S serviceid query a specific service id
-S state new port state (opaportconfig)
--T product IntelOPA product type to install
+-T product CornelisOPX product type to install
-T timelimit timelimit for opacmdall operations and tools using opacmdall
-T file name of topology file input/output file or SSL/TLS parameters XML file
-U only perform connect (for opasetupssh)
diff --git a/IbaTools/FastFabric/load.exp b/IbaTools/FastFabric/load.exp
index b9d07514..59e0a371 100755
--- a/IbaTools/FastFabric/load.exp
+++ b/IbaTools/FastFabric/load.exp
@@ -124,7 +124,7 @@ File: /usr/lib/opa/tools/load.exp" case_setup case_cleanup {
# given driver, its possible that its not on the media
# so we can't expect it to be installed
# for now assume Stack or Enablement tools are always on media
- set drivers {{((OFED OPA Stack)|(OFA OPA Stack)|(OFED IBACM)|(OFA IBACM)|(Intel HFI Components)|(OPA Tools)|(OFED IP over IB)|(OFA IP over IB)|(IFS FM))}}
+ set drivers {{((OFED OPA Stack)|(OFA OPA Stack)|(OFED IBACM)|(OFA IBACM)|(Cornelis HFI Components)|(OPA Tools)|(OFED IP over IB)|(OFA IP over IB)|(IFS FM))}}
install_all $host "$drivers" 1 1 0 "" "$env(CFG_RELEASE)" "$env(CFG_INSTALL_OPTIONS)" "$env(CFG_SCPFROMDIR)" "$env(CFG_PRODUCT)"
}
diff --git a/IbaTools/FastFabric/opa_ca_openssl.cnf b/IbaTools/FastFabric/opa_ca_openssl.cnf
index 26a15561..c8e45002 100644
--- a/IbaTools/FastFabric/opa_ca_openssl.cnf
+++ b/IbaTools/FastFabric/opa_ca_openssl.cnf
@@ -1,5 +1,5 @@
#
-# Intel OPA Self-Signed CA OpenSSL example configuration file.
+# Cornelis OPX Self-Signed CA OpenSSL example configuration file.
# This is mostly being used for generation of certificate requests.
#
diff --git a/IbaTools/FastFabric/opa_comp_openssl.cnf b/IbaTools/FastFabric/opa_comp_openssl.cnf
index 1308b057..7d3ae121 100644
--- a/IbaTools/FastFabric/opa_comp_openssl.cnf
+++ b/IbaTools/FastFabric/opa_comp_openssl.cnf
@@ -1,5 +1,5 @@
#
-# Intel OPA FM/FF Component OpenSSL example configuration file.
+# Cornelis OPX FM/FF Component OpenSSL example configuration file.
# This is mostly being used for generation of certificate requests.
#
diff --git a/IbaTools/FastFabric/opafastfabric.conf.LINUX.OPENIB b/IbaTools/FastFabric/opafastfabric.conf.LINUX.OPENIB
index 96f7627a..f07a6d74 100755
--- a/IbaTools/FastFabric/opafastfabric.conf.LINUX.OPENIB
+++ b/IbaTools/FastFabric/opafastfabric.conf.LINUX.OPENIB
@@ -104,13 +104,13 @@ export FF_TIMEOUT_MULT=${FF_TIMEOUT_MULT:-2}
#export FF_RESULT_DIR=${FF_RESULT_DIR:-.}
export FF_RESULT_DIR=${FF_RESULT_DIR:-$HOME}
-# IntelOPA product to install during opahostadmin load and upgrade
-export FF_PRODUCT=${FF_PRODUCT:-IntelOPA-Basic.`cat /usr/lib/opa/tools/osid_wrapper`}
+# CornelisOPX product to install during opahostadmin load and upgrade
+export FF_PRODUCT=${FF_PRODUCT:-CornelisOPX-Basic.`cat /usr/lib/opa/tools/osid_wrapper`}
-# IntelOPA product version to install during opahostadmin load and upgrade
+# CornelisOPX product version to install during opahostadmin load and upgrade
export FF_PRODUCT_VERSION=${FF_PRODUCT_VERSION:-`cat /etc/opa/version_wrapper 2>/dev/null`}
-# IntelOPA packages to install during opahostadmin load [-P option]
+# CornelisOPX packages to install during opahostadmin load [-P option]
#export FF_PACKAGES=${FF_PACKAGES:-oftools ipoib mpi pgas}
#export FF_PACKAGES=${FF_PACKAGES:-oftools ipoib psm_mpi pgas}
export FF_PACKAGES=${FF_PACKAGES:-oftools ipoib psm_mpi}
diff --git a/IbaTools/FastFabric/opafastfabric.pl b/IbaTools/FastFabric/opafastfabric.pl
index a400f441..fafd618f 100755
--- a/IbaTools/FastFabric/opafastfabric.pl
+++ b/IbaTools/FastFabric/opafastfabric.pl
@@ -50,7 +50,7 @@
my $INT_VERSION = "THIS_IS_THE_ICS_INTERNAL_VERSION_NUMBER:@(#)000.000.000.000B000";
$INT_VERSION =~ s/THIS_IS_THE_ICS_INTERNAL_VERSION_NUMBER:@\(#\)//;
$INT_VERSION =~ s/%.*//;
-my $BRAND = "THIS_IS_THE_ICS_BRAND:Intel% ";
+my $BRAND = "THIS_IS_THE_ICS_BRAND:Cornelis% ";
# backslash before : is so patch_brand doesn't replace string
$BRAND =~ s/THIS_IS_THE_ICS_BRAND\://;
$BRAND =~ s/%.*//;
diff --git a/IbaTools/FastFabric/opatest.sh b/IbaTools/FastFabric/opatest.sh
index b7f71d95..675c4c1f 100755
--- a/IbaTools/FastFabric/opatest.sh
+++ b/IbaTools/FastFabric/opatest.sh
@@ -2,6 +2,7 @@
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015-2020, Intel Corporation
+# Copyright (c) 2021, Cornelis Networks
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
@@ -72,17 +73,17 @@ Usage_opahostadmin_full()
echo " default is '$FF_IPOIB_SUFFIX'" >&2
echo " -f hostfile - file with hosts in cluster, default is $CONFIG_DIR/opa/hosts" >&2
echo " -h hosts - list of hosts to execute operation against" >&2
- echo " -r release - IntelOPA release to load/upgrade to, default is $FF_PRODUCT_VERSION" >&2
+ echo " -r release - CornelisOPX release to load/upgrade to, default is $FF_PRODUCT_VERSION" >&2
echo " -d dir - directory to get product.release.tgz from for load/upgrade" >&2
- echo " -I install_options - IntelOPA install options" >&2
- echo " -U upgrade_options - IntelOPA upgrade options" >&2
- echo " -T product - IntelOPA product type to install" >&2
+ echo " -I install_options - CornelisOPX install options" >&2
+ echo " -U upgrade_options - CornelisOPX upgrade options" >&2
+ echo " -T product - CornelisOPX product type to install" >&2
echo " default is $FF_PRODUCT" >&2
- echo " Other options include: IntelOPA-Basic.," >&2
- echo " IntelOPA-IFS." >&2
+ echo " Other options include: CornelisOPX-Basic.," >&2
+ echo " CornelisOPX-OPXS." >&2
echo " Where is the distro and CPU, such as RHEL7-x86_64" >&2
- echo " -P packages - IntelOPA packages to install, default is '$FF_PACKAGES'" >&2
- echo " See IntelOPA INSTALL -C for a complete list of packages" >&2
+ echo " -P packages - CornelisOPX packages to install, default is '$FF_PACKAGES'" >&2
+ echo " See CornelisOPX INSTALL -C for a complete list of packages" >&2
echo " -m netmask - IPoIB netmask to use for configipoib" >&2
echo " -S - securely prompt for password for user on remote system" >&2
echo " operation - operation to perform. operation can be one or more of:" >&2
@@ -278,14 +279,14 @@ Usage_opahostadmin()
echo " --help - produce full help text" >&2
echo " -c - clobber result files from any previous run before starting this run" >&2
echo " -f hostfile - file with hosts in cluster, default is $CONFIG_DIR/opa/hosts" >&2
- echo " -r release - IntelOPA release to load/upgrade to, default is $FF_PRODUCT_VERSION" >&2
+ echo " -r release - CornelisOPX release to load/upgrade to, default is $FF_PRODUCT_VERSION" >&2
echo " -d dir - directory to get product.release.tgz from for load/upgrade" >&2
- echo " -T product - IntelOPA product type to install" >&2
+ echo " -T product - CornelisOPX product type to install" >&2
echo " default is $FF_PRODUCT" >&2
- echo " Other options include: IntelOPA-Basic., IntelOPA-IFS." >&2
+ echo " Other options include: CornelisOPX-Basic., CornelisOPX-OPXS." >&2
echo " Where is the distro and CPU, such as RHEL7-x86_64" >&2
- echo " -P packages - IntelOPA packages to install, default is '$FF_PACKAGES'" >&2
- echo " See IntelOPA INSTALL -C for a complete list of packages" >&2
+ echo " -P packages - CornelisOPX packages to install, default is '$FF_PACKAGES'" >&2
+ echo " See CornelisOPX INSTALL -C for a complete list of packages" >&2
echo " -S - securely prompt for password for user on remote system" >&2
echo " operation - operation to perform. operation can be one or more of:" >&2
echo " load - initial install of all hosts" >&2
@@ -478,7 +479,7 @@ export TL_DIR=/usr/lib/opa/tools
export TEST_IDENTIFY=no
export TEST_SHOW_CONFIG=no
export TEST_SHOW_START=yes
-export CFG_PRODUCT="${FF_PRODUCT:-IntelOPA-Basic}"
+export CFG_PRODUCT="${FF_PRODUCT:-CornelisOPX-Basic}"
export CFG_INSTALL_OPTIONS="$FF_INSTALL_OPTIONS"
export CFG_UPGRADE_OPTIONS="$FF_UPGRADE_OPTIONS"
export CFG_IPOIB_NETMASK="$FF_IPOIB_NETMASK"
diff --git a/IbaTools/FastFabric/upgrade.exp b/IbaTools/FastFabric/upgrade.exp
index dd4abe57..4da08dc0 100755
--- a/IbaTools/FastFabric/upgrade.exp
+++ b/IbaTools/FastFabric/upgrade.exp
@@ -124,7 +124,7 @@ File: /usr/lib/opa/tools/upgrade.exp" case_setup case_cleanup {
# given driver, its possible that its not on the media
# so we can't expect it to be installed
# for now assume Stack or Enablement tools are always on media
- set drivers {{((OFED OPA Stack)|(OFA OPA Stack)|(OFED IBACM)|(OFA IBACM)|(Intel HFI Components)|(OPA Tools)|(OFED IP over IB)|(OFA IP over IB)|(OPA FM))}}
+ set drivers {{((OFED OPA Stack)|(OFA OPA Stack)|(OFED IBACM)|(OFA IBACM)|(Cornelis HFI Components)|(OPA Tools)|(OFED IP over IB)|(OFA IP over IB)|(OPA FM))}}
install_all $host "$drivers" 0 0 0 "" "$env(CFG_RELEASE)" "-U $env(CFG_UPGRADE_OPTIONS)" "$env(CFG_SCPFROMDIR)" "$env(CFG_PRODUCT)"
}
diff --git a/MakeTools/funcs-ext.sh b/MakeTools/funcs-ext.sh
index e0d584ef..16683d80 100755
--- a/MakeTools/funcs-ext.sh
+++ b/MakeTools/funcs-ext.sh
@@ -725,6 +725,9 @@ function os_vendor()
centos)
rval=redhat
;;
+ rocky)
+ rval=redhat
+ ;;
fedora)
rval=redhat
;;
@@ -754,6 +757,9 @@ function os_vendor()
rval=UnitedLinux
fi
elif [ $rval = 'centos' ]
+ then
+ rval=redhat
+ elif [ $rval = 'rocky' ]
then
rval=redhat
elif [ $rval != 'os' ]
@@ -830,6 +836,10 @@ function os_vendor_version()
then
# CentOS
rval="ES"`cat /etc/redhat-release | sed -r 's/^.+([[:digit:]])\.([[:digit:]]).+$/\1\2/'`
+ elif grep -qi rocky /etc/redhat-release
+ then
+ # Rocky
+ rval="ES"`cat /etc/redhat-release | sed -r 's/^.+([[:digit:]])\.([[:digit:]]).+$/\1\2/'`
elif grep -qi scientific /etc/redhat-release
then
# Scientific Linux.
@@ -1307,13 +1317,20 @@ getIntelcompilervarsfile()
prefix=$1
subdir=$2
foundfile=
- for f in $(ls -rd /opt/intel/${prefix}*)
- do
- if [ -f $f/$subdir/bin/compilervars.sh ]
- then
- foundfile=$f/$subdir/bin/compilervars.sh
- break
- fi
- done
+ if [ "$prefix" == "oneapi" ];
+ then
+ foundfile=/opt/intel/${prefix}/setvars.sh
+
+ else
+
+ for f in $(ls -rd /opt/intel/${prefix}*)
+ do
+ if [ -f $f/$subdir/bin/compilervars.sh ]
+ then
+ foundfile=$f/$subdir/bin/compilervars.sh
+ break
+ fi
+ done
+ fi
echo "$foundfile"
}
diff --git a/Topology/snapshot.c b/Topology/snapshot.c
index aa0b6e4b..d972ba5a 100644
--- a/Topology/snapshot.c
+++ b/Topology/snapshot.c
@@ -2516,7 +2516,8 @@ static void *McPortGIDXmlParserStart(IXmlParserState_t *state, void *parent, con
// no preexisting membership info
mcmemberp->MemberInfo.JoinFullMember=0;
mcmemberp->MemberInfo.JoinNonMember=0;
- mcmemberp->MemberInfo.JoinSendOnlyMember=0;
+ mcmemberp->MemberInfo.JoinSendOnlyNonMember=0;
+ mcmemberp->MemberInfo.JoinSendOnlyFullMember=0;
return mcmemberp;
}
@@ -2604,7 +2605,9 @@ static void McMembershipXmlParserEnd(IXmlParserState_t *state, const IXML_FIELD
value = value >> 1;
mcmemberp->MemberInfo.JoinNonMember = value & 1;
value = value >> 1;
- mcmemberp->MemberInfo.JoinSendOnlyMember = value & 1;
+ mcmemberp->MemberInfo.JoinSendOnlyNonMember = value & 1;
+ value = value >> 1;
+ mcmemberp->MemberInfo.JoinSendOnlyFullMember = value & 1;
}
return;
@@ -2681,7 +2684,8 @@ static void McMembershipXmlOutput(IXmlOutputState_t *state, const char* tag, voi
McMemberData *pMcMemberRecord = (McMemberData *)data;
uint8 Memberstatus;
- Memberstatus = (pMcMemberRecord->MemberInfo.JoinSendOnlyMember<<2 |
+ Memberstatus = (pMcMemberRecord->MemberInfo.JoinSendOnlyFullMember<<3 |
+ pMcMemberRecord->MemberInfo.JoinSendOnlyNonMember<<2 |
pMcMemberRecord->MemberInfo.JoinNonMember<<1 |
pMcMemberRecord->MemberInfo.JoinFullMember);
diff --git a/Topology/sweep.c b/Topology/sweep.c
index 7183760d..fb58d5de 100644
--- a/Topology/sweep.c
+++ b/Topology/sweep.c
@@ -2613,6 +2613,7 @@ FSTATUS GetAllPortCounters(EUI64 portGuid, IB_GID localGid, FabricData_t *fabric
STL_LID lid = 0;
STL_PA_IMAGE_ID_DATA img_id_end = {0};
STL_PA_IMAGE_ID_DATA img_id_begin = {0};
+ uint32 absolute_time;
#endif
int i=0;
int num_nodes = cl_qmap_count(&fabricp->AllNodes);
@@ -2667,14 +2668,16 @@ FSTATUS GetAllPortCounters(EUI64 portGuid, IB_GID localGid, FabricData_t *fabric
img_id_end.imageTime.absoluteTime = end ? end : begin;
status = omgt_pa_get_image_info(g_portHandle, img_id_end, &img_info_end);
if (status != FSUCCESS) {
- fprintf(stderr, "%s: failed to get image info at %s\n", __func__, ctime((time_t *)&img_id_end.imageTime.absoluteTime));
+ memcpy((uint8 *)&absolute_time, (uint8 *)&img_id_end.imageTime.absoluteTime, sizeof(uint32));
+ fprintf(stderr, "%s: failed to get image info at %s\n", __func__, ctime((time_t *)&absolute_time));
return status;
}
img_id_end = img_info_end.imageId;
status = omgt_pa_freeze_image(g_portHandle, img_id_end, &img_id_end);
if (status != FSUCCESS) {
- fprintf(stderr, "%s: failed to freeze image at %s\n", __func__, ctime((time_t *)&img_id_end.imageTime.absoluteTime));
+ memcpy((uint8 *)&absolute_time, (uint8 *)&img_id_end.imageTime.absoluteTime, sizeof(uint32));
+ fprintf(stderr, "%s: failed to freeze image at %s\n", __func__, ctime((time_t *)&absolute_time));
return status;
}
}
@@ -2815,7 +2818,8 @@ FSTATUS GetAllPortCounters(EUI64 portGuid, IB_GID localGid, FabricData_t *fabric
if ((begin || end) && (g_paclient_state == OMGT_SERVICE_STATE_OPERATIONAL)) {
status = omgt_pa_release_image(g_portHandle, img_id_end);
if (status != FSUCCESS) {
- fprintf(stderr, "%s: failed to release frozen image at %s\n", __func__, ctime((time_t *)&img_id_end.imageTime.absoluteTime));
+ memcpy((uint8 *)&absolute_time, (uint8 *)&img_id_end.imageTime.absoluteTime, sizeof(uint32));
+ fprintf(stderr, "%s: failed to release frozen image at %s\n", __func__, ctime((time_t *)&absolute_time));
return status;
}
}
@@ -2826,7 +2830,8 @@ FSTATUS GetAllPortCounters(EUI64 portGuid, IB_GID localGid, FabricData_t *fabric
img_id_begin.imageTime.absoluteTime = begin;
status = omgt_pa_get_image_info(g_portHandle, img_id_begin, &img_info_begin);
if (status != FSUCCESS) {
- fprintf(stderr, "%s: failed to get image info at %s\n", __func__, ctime((time_t *)&img_id_begin.imageTime.absoluteTime));
+ memcpy((uint8 *)&absolute_time, (uint8 *)&img_id_begin.imageTime.absoluteTime, sizeof(uint32));
+ fprintf(stderr, "%s: failed to get image info at %s\n", __func__, ctime((time_t *)&absolute_time));
return status;
}
img_id_begin = img_info_begin.imageId;
@@ -2886,11 +2891,13 @@ FSTATUS GetAllPortCounters(EUI64 portGuid, IB_GID localGid, FabricData_t *fabric
} // END: for all nodes
status = omgt_pa_release_image(g_portHandle, img_id_begin);
if (status != FSUCCESS) {
- fprintf(stderr, "%s: failed to release frozen image at %s\n", __func__, ctime((time_t *)&img_id_begin.imageTime.absoluteTime));
+ memcpy((uint8 *)&absolute_time, (uint8 *)&img_id_begin.imageTime.absoluteTime, sizeof(uint32));
+ fprintf(stderr, "%s: failed to release frozen image at %s\n", __func__, ctime((time_t *)&absolute_time));
return status;
}
} else if (status != FSUCCESS) {
- fprintf(stderr, "%s: failed to freeze image at %s\n", __func__, ctime((time_t *)&img_id_begin.imageTime.absoluteTime));
+ memcpy((uint8 *)&absolute_time, (uint8 *)&img_id_begin.imageTime.absoluteTime, sizeof(uint32));
+ fprintf(stderr, "%s: failed to freeze image at %s\n", __func__, ctime((time_t *)&absolute_time));
return status;
}
}
diff --git a/opa-fm.spec.in b/opa-fm.spec.in
index d63f18fd..ffdc3ba3 100644
--- a/opa-fm.spec.in
+++ b/opa-fm.spec.in
@@ -29,8 +29,8 @@
#[ICS VERSION STRING: unknown]
Name: opa-fm
-Version: 10.11.0.0
-Release: 574%{?dist}
+Version: 10.11.1.3
+Release: 1%{?dist}
%if 0%{?rhel}
Epoch: 1
%endif
@@ -62,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.3.0.11%{?dist}
+IFSComponent: FM 10.11.1.3.1%{?dist}
%prep
%setup -q -c