Commit 3ca3fd5e authored by Scott Breyer's avatar Scott Breyer

Update to latest from build 10.6.0.0.131 (IFS 10.6.0.0.134)

parent 206c362b
......@@ -3,15 +3,15 @@ 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 QLogicIB-IFS is main_openibwrap.pl
the one of interest for IntelOPA-IFS 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_openibwrap.pl is a packaging for IntelOPA-IFS and
IntelOPA-Basic. A simpler example is main_qlgc_fm.pl which is a packaging
consisting of just the SM.
capabilities are. main_omnipathwrap_delta.pl is a packaging for IntelOPA-IFS
and IntelOPA-Basic. This main is also used for individual component INSTALLs
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.
......
This diff is collapsed.
......@@ -77,10 +77,9 @@ my @intel_hfi_prereq = (
"glibc",
"libgcc",
"libibverbs",
"libuuid",
"libuuid-devel",
"python",
"systemd",
"numactl-libs",
"irqbalance",
);
$comp_prereq_hash{'intel_hfi_prereq'} = \@intel_hfi_prereq;
......
......@@ -68,10 +68,9 @@ my @intel_hfi_prereq = (
"libhfi1",
"glibc",
"libgcc",
"libuuid",
"libuuid-devel",
"python",
"systemd",
"numactl-libs",
"irqbalance",
);
$comp_prereq_hash{'intel_hfi_prereq'} = \@intel_hfi_prereq;
......
#!/usr/bin/perl
## BEGIN_ICS_COPYRIGHT8 ****************************************
##
## Copyright (c) 2015, 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",
"libibmad",
"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",
"papi",
"pkgconfig",
"zlib",
);
$comp_prereq_hash{'openmpi_prereq'} = \@openmpi_prereq;
my @gasnet_prereq = (
"bash",
"glibc",
);
$comp_prereq_hash{'gasnet_prereq'} = \@gasnet_prereq;
my @openshmem_prereq = (
"bash",
"elfutils-libelf-devel",
"elfutils-libelf",
"glibc",
);
$comp_prereq_hash{'openshmem_prereq'} = \@openshmem_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",
"papi",
"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;
......@@ -81,10 +81,9 @@ my @intel_hfi_prereq = (
"libgcc_s1",
"libibverbs1",
"libncurses5",
"libuuid1",
"libuuid-devel",
"python-base",
"udev",
"libnuma1",
"irqbalance",
);
$comp_prereq_hash{'intel_hfi_prereq'} = \@intel_hfi_prereq;
......
......@@ -64,14 +64,13 @@ my @intel_hfi_prereq = (
"glibc",
"libhfi1verbs-rdmav2",
"libgcc_s1",
"libuuid1",
"bash",
"libuuid-devel",
"udev",
"libudev-devel",
"python-base",
"libedit0",
"libncurses5",
"libnuma1",
"irqbalance",
);
$comp_prereq_hash{'intel_hfi_prereq'} = \@intel_hfi_prereq;
......
#!/usr/bin/perl
## BEGIN_ICS_COPYRIGHT8 ****************************************
##
## Copyright (c) 2015, Intel Corporation
##
## Redistribution and use in source and binary forms, with or without
## modification, are permitted provided that the following conditions are met:
##
## * Redistributions of source code must retain the above copyright notice,
## this list of conditions and the following disclaimer.
## * Redistributions in binary form must reproduce the above copyright
## notice, this list of conditions and the following disclaimer in the
## documentation and/or other materials provided with the distribution.
## * Neither the name of Intel Corporation nor the names of its contributors
## may be used to endorse or promote products derived from this software
## without specific prior written permission.
##
## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
## AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
## IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
## DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
## FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
## DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
## SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
## CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
##
## END_ICS_COPYRIGHT8 ****************************************
#
## [ICS VERSION STRING: unknown]
#use strict;
##use Term::ANSIColor;
##use Term::ANSIColor qw(:constants);
##use File::Basename;
##use Math::BigInt;
#
## ==========================================================================
#
#Installation Prequisites array for delta components
my @opa_stack_prereq = (
"bash",
"kmod",
"rdma-core",
"systemd",
"coreutils",
"grep",
"opensm-libs3",
"libibmad5",
"libibcm1",
"libibumad3",
"rdma-core-devel",
);
$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",
"bash",
"udev",
"libudev-devel",
"python-base",
"libedit0",
"libncurses5",
"libnuma1",
"irqbalance",
);
$comp_prereq_hash{'intel_hfi_prereq'} = \@intel_hfi_prereq;
my @mvapich2_gcc_hfi_prereq = (
"bash",
"glibc",
"libz1",
);
$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 = (
"glibc",
"bash",
"libpsm_infinipath1",
"pkg-config",
"libgcc_s1",
"libgfortran3",
"gcc-fortran",
"libgomp1",
"libibverbs1",
"libquadmath0",
"librdmacm1",
"libstdc++6",
"libz1",
"opensm-libs3",
"opensm-devel",
);
$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;
my @mvapich2_prereq = (
"bash",
"libibverbs1",
"librdmacm1",
"glibc",
"libz1",
);
$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",
);
$comp_prereq_hash{'openmpi_prereq'} = \@openmpi_prereq;
my @gasnet_prereq = (
"bash",
"coreutils",
"grep",
"glibc",
);
$comp_prereq_hash{'gasnet_prereq'} = \@gasnet_prereq;
my @openshmem_prereq = (
"bash",
"libelf1",
"libelf-devel",
"glibc",
);
$comp_prereq_hash{'openshmem_prereq'} = \@openshmem_prereq;
......@@ -43,13 +43,13 @@ my $FF_TLS_CONF_FILE = "/etc/opa/opaff.xml";
sub available_fastfabric
{
my $srcdir=$ComponentInfo{'fastfabric'}{'SrcDir'};
return ((rpm_resolve("$srcdir/RPMS/*/", "any", "opa-basic-tools") ne "") &&
return ((rpm_resolve("$srcdir/RPMS/*/", "any", "opa-mpi-apps") ne "") &&
(rpm_resolve("$srcdir/RPMS/*/", "any", "opa-fastfabric") ne ""));
}
sub installed_fastfabric
{
return(system("rpm -q --quiet opa-fastfabric") == 0)
return rpm_is_installed("opa-fastfabric", "any");
}
# only called if installed_fastfabric is true
......@@ -63,7 +63,10 @@ sub installed_version_fastfabric
sub media_version_fastfabric
{
my $srcdir=$ComponentInfo{'fastfabric'}{'SrcDir'};
return `cat "$srcdir/version"`;
my $rpmfile = rpm_resolve("$srcdir/RPMS/*/", "any", "opa-fastfabric");
my $version= rpm_query_version_release("$rpmfile");
# assume media properly built with matching versions for all rpms
return dot_version("$version");
}
sub build_fastfabric
......@@ -107,13 +110,12 @@ sub install_fastfabric
my $version=media_version_fastfabric();
chomp $version;
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";
check_config_dirs();
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");
rpm_run_install($rpmfile, "any", " -U ");
check_dir("/usr/lib/opa/tools");
# TBD - spec file should do this
check_dir("/usr/share/opa/samples");
system "chmod ug+x $ROOT/usr/share/opa/samples/hostverify.sh";
system "rm -f $ROOT/usr/share/opa/samples/nodeverify.sh";
......@@ -127,17 +129,17 @@ sub install_fastfabric
check_rpm_config_file("$CONFIG_DIR/opa/hosts", $depricated_dir);
check_rpm_config_file("$CONFIG_DIR/opa/ports", $depricated_dir);
check_rpm_config_file("$CONFIG_DIR/opa/switches", $depricated_dir);
# TBD - this should not be a config file
check_rpm_config_file("/usr/lib/opa/tools/osid_wrapper");
#install_conf_file("$ComponentInfo{'fastfabric'}{'Name'}", "$FF_TLS_CONF_FILE", "$srcdir/fastfabric/tools/tls");
#remove_conf_file("$ComponentInfo{'fastfabric'}{'Name'}", "$OPA_CONFIG_DIR/iba_stat.conf");
# 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");
rpm_run_install($rpmfile, "any", " -U ");
$ComponentWasInstalled{'fastfabric'}=1;
}
......@@ -191,14 +193,16 @@ sub installed_opamgt_sdk
sub installed_version_opamgt_sdk
{
return rpm_query_version_release_pkg("opa-libopamgt-devel");
my $version = rpm_query_version_release_pkg("opa-libopamgt-devel");
return dot_version("$version");
}
sub media_version_opamgt_sdk
{
my $srcdir = $ComponentInfo{'opamgt_sdk'}{'SrcDir'};
my $rpm = rpm_resolve("$srcdir/RPMS/*/", "any", "opa-libopamgt-devel");
return rpm_query_version_release($rpm);
my $version = rpm_query_version_release($rpm);
return dot_version("$version");
}
sub build_opamgt_sdk
......
#!/usr/bin/perl
## BEGIN_ICS_COPYRIGHT8 ****************************************
##
## Copyright (c) 2015, 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",
"libstdc++",
"ibacm",
"rdma-core",
);
$comp_prereq_hash{'oftools_prereq'} = \@oftools_prereq;
my @fastfabric_prereq = (
"atlas",
"bash",
"bc",
"expat",
"expect",
"glibc",
"libgcc",
"libibmad",
"libibumad",
"libibverbs",
"libstdc++",
"ncurses-libs",
"openssl-libs",
"perl",
"perl-Getopt-Long",
"perl-Socket",
"rdma-core",
"tcl",
"zlib",
"qperf",
"perftest",
);
$comp_prereq_hash{'fastfabric_prereq'} = \@fastfabric_prereq;
#!/usr/bin/perl
## BEGIN_ICS_COPYRIGHT8 ****************************************
##
## Copyright (c) 2015, Intel Corporation
##
## Redistribution and use in source and binary forms, with or without
## modification, are permitted provided that the following conditions are met:
##
## * Redistributions of source code must retain the above copyright notice,
## this list of conditions and the following disclaimer.
## * Redistributions in binary form must reproduce the above copyright
## notice, this list of conditions and the following disclaimer in the
## documentation and/or other materials provided with the distribution.
## * Neither the name of Intel Corporation nor the names of its contributors
## may be used to endorse or promote products derived from this software
## without specific prior written permission.
##
## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
## AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
## IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
## DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
## FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
## DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
## SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
## CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
##
## END_ICS_COPYRIGHT8 ****************************************
#
## [ICS VERSION STRING: unknown]
#use strict;
##use Term::ANSIColor;
##use Term::ANSIColor qw(:constants);
##use File::Basename;
##use Math::BigInt;
#
## ==========================================================================
#
#Installation Prequisites array for fast fabric
#and of tools component
my @oftools_prereq = (
"glibc",
"libgcc_s1",
"libibmad5",
"libibumad3",
"libibverbs1",
"libstdc++6",
"ibacm",
);
$comp_prereq_hash{'oftools_prereq'} = \@oftools_prereq;
my @fastfabric_prereq = (
"glibc",
"bash",
"expect",
"perl-base",
"tcl",
"libexpat1",
"libgcc_s1",