Commit cb934204 authored by Scott Breyer's avatar Scott Breyer

Update to latest from build 10.8.0.0.201 (IFS 10.8.0.0.204)

parent c6b993a4
......@@ -16,6 +16,9 @@ along with the corresponding override*pl file.
routines in a comp.pl file:
config_autostart_X - called to configure autostart of component. Only called if HasStart set in main.
get_rpms_dir_X - returns the directory on the media which contains the given
package within the component
available_X - is component X available on the install media (use of this allows for optional components in packaging or limited availability if a component isn't available on some OS/CPU combos)
installed_X - is component X presently installed on the system. This is a quick check, not a "verify".
......
This diff is collapsed.
......@@ -107,7 +107,6 @@ my @openmpi_prereq = (
"libstdc++",
"libstdc++-devel",
"opensm-libs",
"papi",
"pkgconfig",
"zlib",
);
......@@ -139,7 +138,6 @@ my @openmpi_gcc_hfi_prereq = (
"libstdc++",
"libstdc++-devel",
"opensm-libs",
"papi",
"pkgconfig",
"zlib",
);
......
......@@ -98,7 +98,6 @@ my @openmpi_prereq = (
"libstdc++",
"libstdc++-devel",
"opensm-libs",
"papi",
"pkgconfig",
"zlib",
);
......@@ -130,7 +129,6 @@ my @openmpi_gcc_hfi_prereq = (
"libstdc++",
"libstdc++-devel",
"opensm-libs",
"papi",
"pkgconfig",
"zlib",
);
......
......@@ -47,7 +47,6 @@ my @opa_stack_prereq = (
"glibc",
"pciutils",
"opensm-libs",
"libibmad",
"libibcm",
"libibumad",
"rdma-core-devel",
......@@ -97,7 +96,6 @@ my @openmpi_prereq = (
"libstdc++",
"libstdc++-devel",
"opensm-libs",
"papi",
"pkgconfig",
"zlib",
);
......@@ -129,7 +127,6 @@ my @openmpi_gcc_hfi_prereq = (
"libstdc++",
"libstdc++-devel",
"opensm-libs",
"papi",
"pkgconfig",
"zlib",
);
......
#!/usr/bin/perl
## BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015-2017, 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;
......@@ -53,13 +53,6 @@ my @opa_stack_prereq = (
);
$comp_prereq_hash{'opa_stack_prereq'} = \@opa_stack_prereq;
my @mpi_selector_prereq = (
"bash",
"coreutils",
"tcsh",
);
$comp_prereq_hash{'mpi_selector_prereq'} = \@mpi_selector_prereq;
my @intel_hfi_prereq = (
"glibc",
"libhfi1verbs-rdmav2",
......@@ -79,11 +72,13 @@ my @mvapich2_gcc_hfi_prereq = (
"bash",
"glibc",
"libz1",
"mpi-selector",
);
$comp_prereq_hash{'mvapich2_gcc_hfi_prereq'} = \@mvapich2_gcc_hfi_prereq;
my @mvapich2_intel_hfi_prereq = (
"bash",
"mpi-selector",
);
$comp_prereq_hash{'mvapich2_intel_hfi_prereq'} = \@mvapich2_intel_hfi_prereq;
......@@ -103,11 +98,13 @@ my @openmpi_gcc_hfi_prereq = (
"libz1",
"opensm-libs3",
"opensm-devel",
"mpi-selector",
);
$comp_prereq_hash{'openmpi_gcc_hfi_prereq'} = \@openmpi_gcc_hfi_prereq;
my @openmpi_intel_hfi_prereq = (
"bash",
"mpi-selector",
);
$comp_prereq_hash{'openmpi_intel_hfi_prereq'} = \@openmpi_intel_hfi_prereq;
......@@ -117,6 +114,7 @@ my @mvapich2_prereq = (
"librdmacm1",
"glibc",
"libz1",
"mpi-selector",
);
$comp_prereq_hash{'mvapich2_prereq'} = \@mvapich2_prereq;
......@@ -136,5 +134,6 @@ my @openmpi_prereq = (
"libz1",
"opensm-libs3",
"opensm-devel",
"mpi-selector",
);
$comp_prereq_hash{'openmpi_prereq'} = \@openmpi_prereq;
......@@ -53,13 +53,6 @@ my @opa_stack_prereq = (
);
$comp_prereq_hash{'opa_stack_prereq'} = \@opa_stack_prereq;
my @mpi_selector_prereq = (
"bash",
"coreutils",
"tcsh",
);
$comp_prereq_hash{'mpi_selector_prereq'} = \@mpi_selector_prereq;
my @intel_hfi_prereq = (
"glibc",
"libgcc_s1",
......@@ -78,11 +71,13 @@ my @mvapich2_gcc_hfi_prereq = (
"bash",
"glibc",
"libz1",
"mpi-selector",
);
$comp_prereq_hash{'mvapich2_gcc_hfi_prereq'} = \@mvapich2_gcc_hfi_prereq;
my @mvapich2_intel_hfi_prereq = (
"bash",
"mpi-selector",
);
$comp_prereq_hash{'mvapich2_intel_hfi_prereq'} = \@mvapich2_intel_hfi_prereq;
......@@ -102,11 +97,13 @@ my @openmpi_gcc_hfi_prereq = (
"libz1",
"opensm-libs3",
"opensm-devel",
"mpi-selector",
);
$comp_prereq_hash{'openmpi_gcc_hfi_prereq'} = \@openmpi_gcc_hfi_prereq;
my @openmpi_intel_hfi_prereq = (
"bash",
"mpi-selector",
);
$comp_prereq_hash{'openmpi_intel_hfi_prereq'} = \@openmpi_intel_hfi_prereq;
......@@ -116,6 +113,7 @@ my @mvapich2_prereq = (
"librdmacm1",
"glibc",
"libz1",
"mpi-selector",
);
$comp_prereq_hash{'mvapich2_prereq'} = \@mvapich2_prereq;
......@@ -135,5 +133,6 @@ my @openmpi_prereq = (
"libz1",
"opensm-libs3",
"opensm-devel",
"mpi-selector",
);
$comp_prereq_hash{'openmpi_prereq'} = \@openmpi_prereq;
#!/usr/bin/perl
## BEGIN_ICS_COPYRIGHT8 ****************************************
#
#
# Copyright (c) 2015-2017, Intel Corporation
#
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
#
# * Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above copyright
......@@ -14,7 +14,7 @@
# * Neither the name of Intel Corporation nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
......@@ -25,7 +25,7 @@
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
## END_ICS_COPYRIGHT8 ****************************************
#
## [ICS VERSION STRING: unknown]
......@@ -40,115 +40,97 @@
#Installation Prequisites array for delta components
my @opa_stack_prereq = (
"bash",
"kmod",
"rdma-core",
"systemd",
"coreutils",
"glibc",
"grep",
"kernel-default",
"kmod-compat",
"libglib-2_0-0",
"libibverbs1",
"libudev1",
"libudev-devel",
"opensm-libs3",
"pciutils",
"perl",
"perl-base",
"rdma",
"systemd",
"kernel-devel",
"libibcm1",
"libosmcomp3",
"libibmad5",
"libibumad3",
"rdma-core-devel",
);
$comp_prereq_hash{'opa_stack_prereq'} = \@opa_stack_prereq;
my @ibacm_prereq = (
"aaa_base",
"bash",
"glibc",
"libibverbs1",
);
$comp_prereq_hash{'ibacm_prereq'} = \@ibacm_prereq;
my @mpi_selector_prereq = (
"bash",
"coreutils",
"tcsh",
);
$comp_prereq_hash{'mpi_selector_prereq'} = \@mpi_selector_prereq;
my @intel_hfi_prereq = (
"bash",
"glibc",
"libgcc_s1",
"libibverbs1",
"libncurses5",
"python-base",
"bash",
"udev",
"libudev-devel",
"python-base",
"libedit0",
"libncurses6",
"libnuma1",
"irqbalance",
);
$comp_prereq_hash{'intel_hfi_prereq'} = \@intel_hfi_prereq;
my @mvapich2_gcc_hfi_prereq = (
"bash",
"glibc",
"libz1",
"bash",
"glibc",
"libz1",
"mpi-selector",
);
$comp_prereq_hash{'mvapich2_gcc_hfi_prereq'} = \@mvapich2_gcc_hfi_prereq;
my @mvapich2_intel_hfi_prereq = (
"bash",
"bash",
"mpi-selector",
);
$comp_prereq_hash{'mvapich2_intel_hfi_prereq'} = \@mvapich2_intel_hfi_prereq;
my @openmpi_gcc_hfi_prereq = (
"glibc",
"bash",
"libpsm_infinipath1",
"pkg-config",
"libgcc_s1",
"libgfortran3",
"gcc-fortran",
"libgomp1",
"libibverbs1",
"libquadmath0",
"librdmacm1",
"libstdc++6",
"libz1",
"opensm-libs3",
"opensm-devel",
"libz1",
"glibc",
"bash",
"libpsm_infinipath1",
"pkg-config",
"libgcc_s1",
"libgfortran4",
"gcc-fortran",
"libgomp1",
"libibverbs1",
"libquadmath0",
"librdmacm1",
"libstdc++6",
"libz1",
"opensm-devel",
"mpi-selector",
);
$comp_prereq_hash{'openmpi_gcc_hfi_prereq'} = \@openmpi_gcc_hfi_prereq;
my @openmpi_intel_hfi_prereq = (
"bash",
"bash",
"mpi-selector",
);
$comp_prereq_hash{'openmpi_intel_hfi_prereq'} = \@openmpi_intel_hfi_prereq;
my @mvapich2_prereq = (
"bash",
"libibverbs1",
"librdmacm1",
"glibc",
"libz1",
"bash",
"libibverbs1",
"librdmacm1",
"glibc",
"libz1",
"mpi-selector",
);
$comp_prereq_hash{'mvapich2_prereq'} = \@mvapich2_prereq;
my @openmpi_prereq = (
"glibc",
"bash",
"libz1",
"pkg-config",
"libgcc_s1",
"libgfortran3",
"gcc-fortran",
"libgomp1",
"libibverbs1",
"libquadmath0",
"librdmacm1",
"libstdc++6",
"libz1",
"opensm-libs3",
"opensm-devel",
"glibc",
"bash",
"libz1",
"pkg-config",
"libgcc_s1",
"libgfortran3",
"gcc-fortran",
"libgomp1",
"libibverbs1",
"libquadmath0",
"librdmacm1",
"libstdc++6",
"libz1",
"opensm-libs3",
"opensm-devel",
"mpi-selector",
);
$comp_prereq_hash{'openmpi_prereq'} = \@openmpi_prereq;
......@@ -43,8 +43,8 @@ my $FF_TLS_CONF_FILE = "/etc/opa/opaff.xml";
sub available_fastfabric
{
my $srcdir=$ComponentInfo{'fastfabric'}{'SrcDir'};
return ((rpm_resolve("$srcdir/RPMS/*/", "any", "opa-mpi-apps") ne "") &&
(rpm_resolve("$srcdir/RPMS/*/", "any", "opa-fastfabric") ne ""));
return ((rpm_resolve("$srcdir/RPMS/*/opa-mpi-apps", "any") ne "") &&
(rpm_resolve("$srcdir/RPMS/*/opa-fastfabric", "any") ne ""));
}
sub installed_fastfabric
......@@ -63,7 +63,7 @@ sub installed_version_fastfabric
sub media_version_fastfabric
{
my $srcdir=$ComponentInfo{'fastfabric'}{'SrcDir'};
my $rpmfile = rpm_resolve("$srcdir/RPMS/*/", "any", "opa-fastfabric");
my $rpmfile = rpm_resolve("$srcdir/RPMS/*/opa-fastfabric", "any");
my $version= rpm_query_version_release("$rpmfile");
# assume media properly built with matching versions for all rpms
return dot_version("$version");
......@@ -112,7 +112,7 @@ sub install_fastfabric
printf("Installing $ComponentInfo{'fastfabric'}{'Name'} $version $DBG_FREE...\n");
LogPrint "Installing $ComponentInfo{'fastfabric'}{'Name'} $version $DBG_FREE for $CUR_DISTRO_VENDOR $CUR_VENDOR_VER\n";
my $rpmfile = rpm_resolve("$srcdir/RPMS/*/", "any", "opa-fastfabric");
my $rpmfile = rpm_resolve("$srcdir/RPMS/*/opa-fastfabric", "any");
rpm_run_install($rpmfile, "any", " -U ");
# TBD - spec file should do this
......@@ -137,7 +137,7 @@ sub install_fastfabric
# TBD - spec file should remove this
system("rm -rf $ROOT$OPA_CONFIG_DIR/iba_stat.conf"); # old config
$rpmfile = rpm_resolve("$srcdir/RPMS/*/", "any", "opa-mpi-apps");
$rpmfile = rpm_resolve("$srcdir/RPMS/*/opa-mpi-apps", "any");
rpm_run_install($rpmfile, "any", " -U ");
$ComponentWasInstalled{'fastfabric'}=1;
......@@ -166,6 +166,7 @@ sub uninstall_fastfabric
# any logs or other files the user may have created
remove_installed_files "/usr/share/opa/samples";
system "rmdir $ROOT/usr/share/opa/samples 2>/dev/null"; # remove only if empty
# just in case, newer rpms should clean these up
system("rm -rf $ROOT/usr/lib/opa/.comp_fastfabric.pl");
system "rmdir $ROOT/usr/lib/opa 2>/dev/null"; # remove only if empty
......@@ -181,8 +182,8 @@ sub uninstall_fastfabric
sub available_opamgt_sdk
{
my $srcdir = $ComponentInfo{'opamgt_sdk'}{'SrcDir'};
return ( rpm_exists("$srcdir/RPMS/*/", "any", "opa-libopamgt-devel") &&
rpm_exists("$srcdir/RPMS/*/", "any", "opa-libopamgt"));
return ( rpm_exists("$srcdir/RPMS/*/opa-libopamgt-devel", "any") &&
rpm_exists("$srcdir/RPMS/*/opa-libopamgt", "any"));
}
sub installed_opamgt_sdk
......@@ -200,7 +201,7 @@ sub installed_version_opamgt_sdk
sub media_version_opamgt_sdk
{
my $srcdir = $ComponentInfo{'opamgt_sdk'}{'SrcDir'};
my $rpm = rpm_resolve("$srcdir/RPMS/*/", "any", "opa-libopamgt-devel");
my $rpm = rpm_resolve("$srcdir/RPMS/*/opa-libopamgt-devel", "any");
my $version = rpm_query_version_release($rpm);
return dot_version("$version");
}
......@@ -236,8 +237,8 @@ sub install_opamgt_sdk
printf("Installing $ComponentInfo{'opamgt_sdk'}{'Name'} $version $DBG_FREE...\n");
LogPrint "Installing $ComponentInfo{'opamgt_sdk'}{'Name'} $version $DBG_FREE for $CUR_DISTRO_VENDOR $CUR_VENDOR_VER\n";
rpm_install("$srcdir/RPMS/*/", "any", "opa-libopamgt");
rpm_install("$srcdir/RPMS/*/", "any", "opa-libopamgt-devel");
rpm_install("$srcdir/RPMS/*/opa-libopamgt", "any");
rpm_install("$srcdir/RPMS/*/opa-libopamgt-devel", "any");
$ComponentWasInstalled{'opamgt_sdk'}=1;
}
......
......@@ -67,8 +67,6 @@ my @fastfabric_prereq = (
"rdma",
"tcl",
"zlib",
"qperf",
"perftest",
);
$comp_prereq_hash{'fastfabric_prereq'} = \@fastfabric_prereq;
......
......@@ -72,8 +72,6 @@ my @fastfabric_prereq = (
"rdma",
"tcl",
"zlib",
"qperf",
"perftest",
);