Skip to content

Commit

Permalink
Update to latest from build 10.9.0.0.204 (IFS 10.9.0.0.210)
Browse files Browse the repository at this point in the history
  • Loading branch information
Scott Breyer committed Jan 23, 2019
1 parent 86d2a89 commit d6ef451
Show file tree
Hide file tree
Showing 238 changed files with 20,199 additions and 12,618 deletions.
176 changes: 176 additions & 0 deletions CommonInstall/Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015-2018, Intel Corporation
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# * Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# * Neither the name of Intel Corporation nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# END_ICS_COPYRIGHT8 ****************************************
# Makefile for OPENIB_HOST Project

# Include Make Control Settings
include $(TL_DIR)/$(PROJ_FILE_DIR)/Makesettings.project

# default target for project level makefile is stage
stage::
#prepfiles:: prepfiles_global
clobber::
ALL:: ff_files fm_files

BSP_SPECIFIC_DIRS=

#=============================================================================#
# Definitions:
#-----------------------------------------------------------------------------#

# Name of SubProjects
DS_SUBPROJECTS =
# name of executable or downloadable image
EXECUTABLE = #
# list of sub directories to build


DIRS = \

# C files (.c)
CFILES = \
# Add more c files here
# C++ files (.cpp)
CCFILES = \
# Add more cpp files here
# lex files (.lex)
LFILES = \
# Add more lex files here
# archive library files (basename, $ARFILES will add MOD_LIB_DIR/prefix and suffix)
LIBFILES =
# Windows Resource Files (.rc)
RSCFILES =
# Windows IDL File (.idl)
IDLFILE =
# Windows Linker Module Definitions (.def) file for dll's
DEFFILE =
# targets to build during INCLUDES phase (add public includes here)
INCLUDE_TARGETS = \
# Add more h hpp files here
# Non-compiled files
MISC_FILES =
# all source files
SOURCES = $(CFILES) $(CCFILES) $(LFILES) $(RSCFILES) $(IDLFILE)
# Source files to include in DSP File
DSP_SOURCES = $(INCLUDE_TARGETS) $(SOURCES) $(MISC_FILES) \
$(RSCFILES) $(DEFFILE) $(MAKEFILE) Makerules.project
# all object files
OBJECTS = $(CFILES:.c=$(OBJ_SUFFIX)) $(CCFILES:.cpp=$(OBJ_SUFFIX)) \
$(LFILES:.lex=$(OBJ_SUFFIX))
RSCOBJECTS = $(RSCFILES:.rc=$(RES_SUFFIX))
# targets to build during LIBS phase
LIB_TARGETS_IMPLIB =
LIB_TARGETS_ARLIB =
LIB_TARGETS_EXP = $(LIB_TARGETS_IMPLIB:$(ARLIB_SUFFIX)=$(EXP_SUFFIX))
LIB_TARGETS_MISC =
# targets to build during CMDS phase
CMD_TARGETS_SHLIB =
CMD_TARGETS_EXE = $(EXECUTABLE)
CMD_TARGETS_MISC =
# files to remove during clean phase
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_SLES122.pl comp_ff_of_prereq_SLES123.pl comp_ff_of_prereq_SLES124.pl comp_ff_of_prereq_SLES15.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_SLES122.pl comp_fm_prereq_SLES123.pl comp_fm_prereq_SLES124.pl comp_fm_prereq_SLES15.pl
# sub-directory to install to within bin
BIN_SUBDIR =
# sub-directory to install to within include
INCLUDE_SUBDIR =

# Additional Settings
#CLOCALDEBUG = User defined C debugging compilation flags [Empty]
#CCLOCALDEBUG = User defined C++ debugging compilation flags [Empty]
#CLOCAL = User defined C flags for compiling [Empty]
#CCLOCAL = User defined C++ flags for compiling [Empty]
#BSCLOCAL = User flags for Browse File Builder [Empty]
#DEPENDLOCAL = user defined makedepend flags [Empty]
#LINTLOCAL = User defined lint flags [Empty]
#LOCAL_INCLUDE_DIRS = User include directories to search for C/C++ headers [Empty]
#LDLOCAL = User defined C flags for linking [Empty]
#IMPLIBLOCAL = User flags for Object Lirary Manager [Empty]
#MIDLLOCAL = User flags for IDL compiler [Empty]
#RSCLOCAL = User flags for resource compiler [Empty]
#LOCALDEPLIBS = User libraries to include in dependencies [Empty]
#LOCALLIBS = User libraries to use when linking [Empty]
# (in addition to LOCALDEPLIBS)
#LOCAL_LIB_DIRS = User library directories for libpaths [Empty]

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_SLES122.pl \
comp_ff_of_prereq_SLES123.pl comp_ff_of_prereq_SLES124.pl comp_ff_of_prereq_SLES15.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_SLES122.pl \
comp_fm_prereq_SLES123.pl comp_fm_prereq_SLES124.pl comp_fm_prereq_SLES15.pl

# Include Make Rules definitions and rules
include $(TL_DIR)/$(PROJ_FILE_DIR)/Makerules.project

#=============================================================================#
# Overrides:
#-----------------------------------------------------------------------------#
#CCOPT = # C++ optimization flags, default lets build config decide
#COPT = # C optimization flags, default lets build config decide
#SUBSYSTEM = Subsystem to build for (none, console or windows) [none]
# (Windows Only)
#USEMFC = How Windows MFC should be used (none, static, shared, no_mfc) [none]
# (Windows Only)
#=============================================================================#

#=============================================================================#
# Rules:
#-----------------------------------------------------------------------------#
# process Sub-directories
include $(TL_DIR)/Makerules/Maketargets.toplevel

# build cmds and libs
include $(TL_DIR)/Makerules/Maketargets.build

# install for includes, libs and cmds phases
include $(TL_DIR)/Makerules/Maketargets.install

# install for stage phase
include $(TL_DIR)/Makerules/Maketargets.stage

ff_files: $(FF_FILES)

fm_files: $(FM_FILES)

clobber_pl_files:
rm -f $(FF_FILES) $(FM_FILES)

STAGE::

CLOBBER::

#=============================================================================#

#=============================================================================#
# DO NOT DELETE THIS LINE -- make depend depends on it.
#=============================================================================#
24 changes: 21 additions & 3 deletions CommonInstall/comp_delta.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,19 @@
# ==========================================================================
# OFA_Delta installation, includes Intel value-adding packages only

my $default_prefix="/usr";

# all kernel srpms
# these are in the order we must build/process them to meet basic dependencies
my @delta_kernel_srpms_rhel72 = ( 'kmod-ifs-kernel-updates' );
# the kernel srpm for HFI2
my @delta_kernel_srpms_rhel74_hfi2 = ( 'hfi2' );
my @delta_kernel_srpms_sles12_sp2 = ( 'ifs-kernel-updates-kmp-default' );
my @delta_kernel_srpms_sles12_sp3 = ( 'ifs-kernel-updates-kmp-default' );
my @delta_kernel_srpms_sles12_sp4 = ( 'ifs-kernel-updates-kmp-default' );
my @delta_kernel_srpms_sles15 = ( 'ifs-kernel-updates-kmp-default' );
my @delta_kernel_srpms_rhel73 = ( 'kmod-ifs-kernel-updates' );
my @delta_kernel_srpms_rhel74 = ( 'kmod-ifs-kernel-updates' );
my @delta_kernel_srpms_rhel75 = ( 'kmod-ifs-kernel-updates' );
my @delta_kernel_srpms_rhel76 = ( 'kmod-ifs-kernel-updates' );
my @delta_kernel_srpms = ( );

# This provides information for all kernel srpms
Expand Down Expand Up @@ -140,6 +140,9 @@ ($)
} elsif ("$CUR_DISTRO_VENDOR" eq 'SuSE'
&& "$CUR_VENDOR_VER" eq 'ES123') {
@delta_kernel_srpms = ( @delta_kernel_srpms_sles12_sp3 );
} elsif ("$CUR_DISTRO_VENDOR" eq 'SuSE'
&& "$CUR_VENDOR_VER" eq 'ES124') {
@delta_kernel_srpms = ( @delta_kernel_srpms_sles12_sp4 );
} elsif ("$CUR_DISTRO_VENDOR" eq 'SuSE'
&& "$CUR_VENDOR_VER" eq 'ES15') {
@delta_kernel_srpms = ( @delta_kernel_srpms_sles15 );
Expand All @@ -149,6 +152,8 @@ ($)
} else {
@delta_kernel_srpms = (@delta_kernel_srpms_rhel74);
}
} elsif ( "$CUR_VENDOR_VER" eq "ES76" ) {
@delta_kernel_srpms = ( @delta_kernel_srpms_rhel76 );
} elsif ( "$CUR_VENDOR_VER" eq "ES75" ) {
@delta_kernel_srpms = ( @delta_kernel_srpms_rhel75 );
} elsif ( "$CUR_VENDOR_VER" eq "ES73" ) {
Expand Down Expand Up @@ -849,6 +854,9 @@ ()
return ( has_version_delta()
&& rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER));
}
} elsif ( "$CUR_VENDOR_VER" eq "ES76" ) {
return ( has_version_delta()
&& rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER));
} elsif ( "$CUR_VENDOR_VER" eq "ES75" ) {
return ( has_version_delta()
&& rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER));
Expand All @@ -858,6 +866,9 @@ ()
} elsif ( "$CUR_VENDOR_VER" eq 'ES123' ) {
return ( has_version_delta()
&& rpm_is_installed("ifs-kernel-updates-kmp-default", $CUR_OS_VER));
} elsif ( "$CUR_VENDOR_VER" eq 'ES124' ) {
return ( has_version_delta()
&& rpm_is_installed("ifs-kernel-updates-kmp-default", $CUR_OS_VER));
} elsif ( "$CUR_VENDOR_VER" eq 'ES15' ) {
return ( has_version_delta()
&& rpm_is_installed("ifs-kernel-updates-kmp-default", $CUR_OS_VER));
Expand Down Expand Up @@ -1151,9 +1162,15 @@ ()
} elsif ( "$CUR_VENDOR_VER" eq "ES75" ) {
return (has_version_delta()
&& rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER));
} elsif ( "$CUR_VENDOR_VER" eq "ES76" ) {
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));
} elsif ( "$CUR_VENDOR_VER" eq "ES124" ) {
return (has_version_delta()
&& rpm_is_installed("ifs-kernel-updates-kmp-default", $CUR_OS_VER));
} elsif ( "$CUR_VENDOR_VER" eq "ES15" ) {
return (has_version_delta()
&& rpm_is_installed("ifs-kernel-updates-kmp-default", $CUR_OS_VER));
Expand Down Expand Up @@ -1649,7 +1666,8 @@ ($$)
rpm_uninstall_list2("any", " --nodeps ", 'silent', @{ $ComponentInfo{'sandiashmem'}{'UserRpms'}});
my $rpmfile = rpm_resolve(delta_rpms_dir() . "/sandia-openshmem_gcc_hfi", "any");
if ( "$rpmfile" ne "" && -e "$rpmfile" ) {
# try to remove existed SOS folders
# try to remove existed SOS folders. Note this is the workaround for PR 144408. We shall remove the following
# code after we resolve the PR.
my @installed_pkgs = glob("$OFED_prefix/shmem/gcc/sandia-openshmem-*-hfi");
if (@installed_pkgs) {
foreach my $installed_pkg (@installed_pkgs) {
Expand Down
Loading

0 comments on commit d6ef451

Please sign in to comment.