Update to latest from build 10.6.0.0.132 (IFS 10.6.0.0.134)

CodeVersion/Makefile

@@ -0,0 +1,157 @@
+# Makefile for CodeVersion
+
+# BEGIN_ICS_COPYRIGHT8 ****************************************
+# 
+# Copyright (c) 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   ****************************************
+
+# Include Make Control Settings
+include $(TL_DIR)/$(PROJ_FILE_DIR)/Makesettings.project
+
+#=============================================================================#
+# Definitions:
+#-----------------------------------------------------------------------------#
+
+# Name of SubProjects
+DS_SUBPROJECTS	= 
+# name of executable or downloadable image
+EXECUTABLE		= # CodeVersion$(EXE_SUFFIX)
+# list of sub directories to build
+DIRS			= 
+# C files (.c)
+CFILES			= \
+				code_version.c \
+				# 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	= \
+				code_version.h \
+				# 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) 
+# 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_PREFIX)CodeVersion$(ARLIB_SUFFIX)
+LIB_TARGETS_EXP		= $(LIB_TARGETS_IMPLIB:$(ARLIB_SUFFIX)=$(EXP_SUFFIX))
+LIB_TARGETS_MISC	= 
+# targets to build during CMDS phase
+SHLIB_VERSION		= 
+CMD_TARGETS_SHLIB	= 
+CMD_TARGETS_EXE		= $(EXECUTABLE)
+CMD_TARGETS_MISC	=
+CMD_TARGETS_DRIVER	= 
+CMD_TARGETS_KEXT	= 
+# 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=
+# 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	= $(CPIE)
+#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 = 
+
+# 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
+STAGE::
+
+# Unit test execution
+#include $(TL_DIR)/Makerules/Maketargets.runtest
+
+#=============================================================================#
+
+#=============================================================================#
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+#=============================================================================#

CodeVersion/README

@@ -0,0 +1 @@
+library which can return version and brand as set by patch_version

CodeVersion/code_version.c

@@ -0,0 +1,128 @@
+/* BEGIN_ICS_COPYRIGHT7 ****************************************
+
+Copyright (c) 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_COPYRIGHT7   ****************************************/
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+// The functions here can report version and brand strings which are
+// post processed into the executable by invoking patch_version and patch_brand
+// during the build
+//
+// Logs, menus and other interfaces can then use the brand and version strings
+// such as follows:
+//		printf("%s XYZ version %s\n", GetCodeBrand(), GetCodeVersion());
+
+// GetCodeVersion
+// -----------------
+// GetCodeVersion - retrieve the code version as set by build process.
+// The static string contained in this function will be changed
+// by patch_version after the build is complete and the string
+// has been compiled into the application.  This string will be
+// modified as necessary to set the version number to match that of
+// the build cycle.  This routine extracts the version number from
+// the string and returns it.
+// It accepts no arguments and returns "Unknown" if the string cannot
+// be evaluated.
+// The version number created can also be extracted by the strings command
+// or the internal whatversion tool
+//
+#define ICS_BUILD_VERSION "THIS_IS_THE_ICS_VERSION_NUMBER:@(#)000.000.000.000B000"
+const char* GetCodeVersion(void)
+{
+	static const char* BuildVersion=ICS_BUILD_VERSION;
+	static char* version;
+	static int built=0;
+	if (!built)
+	{
+		// locate start of version string,
+		// its the first digit in BuildVersion
+		version = strpbrk(BuildVersion, "0123456789");
+		built=1;
+	}
+	return(version?version:"Unknown");
+}
+
+// GetCodeInternalVersion
+// -----------------
+// GetCodeInternalVersion - retrieve the code version as set by build process.
+// The static string contained in this function will be changed
+// by patch_version after the build is complete and the string
+// has been compiled into the application.  This string will be
+// modified as necessary to set the version to match that of
+// the build cycle.  This routine extracts the version from
+// the string and returns it.
+// It accepts no arguments and returns "Unknown" if the string cannot
+// be evaluated.
+// The version number created can also be extracted by the strings command
+// or the internal whatversion tool
+//
+#define ICS_BUILD_INTERNAL_VERSION "THIS_IS_THE_ICS_INTERNAL_VERSION_NUMBER:@(#)000.000.000.000B000I0000"
+const char* GetCodeInternalVersion(void)
+{
+	static const char* BuildVersion=ICS_BUILD_INTERNAL_VERSION;
+	static char* version;
+	static int built=0;
+	if (!built)
+	{
+		// locate start of version string,
+		// its the first digit in BuildVersion
+		version = strpbrk(BuildVersion, ")") + 1;
+		built=1;
+	}
+	return(version);
+}
+
+// GetCodeBrand
+// -----------------
+// GetCodeBrand - retrieve the code brand as set by build process.
+// The static string contained in this function will be changed
+// by patch_brand after the build is complete and the string
+// has been compiled into the application.  This string will be
+// modified as necessary to set the brand name to match that of
+// the build cycle.  This routine extracts the brand name from
+// the string and returns it.
+// It accepts no arguments.
+// The brand name created can also be extracted by the strings command
+// or the internal whatversion tool
+//
+#define ICS_BUILD_BRAND "THIS_IS_THE_ICS_BRAND:Intel\000                    "
+const char* GetCodeBrand(void)
+{
+	static const char* BuildBrand=ICS_BUILD_BRAND;
+	static char* brand;
+	static int built=0;
+	if (!built)
+	{
+		// locate start of brand string,
+		// its the first : in BuildBrand
+		brand = strpbrk(BuildBrand, ":")+1;
+		built=1;
+	}
+	return(brand);
+}

CodeVersion/code_version.h

@@ -0,0 +1,41 @@
+/* BEGIN_ICS_COPYRIGHT7 ****************************************
+
+Copyright (c) 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_COPYRIGHT7   ****************************************/
+
+/* [ICS VERSION STRING: unknown] */
+
+#ifndef CODEVERSION_H
+#define CODEVERSION_H
+
+#include <stdio.h>
+
+extern const char* GetCodeVersion(void);
+extern const char* GetCodeInternalVersion(void);
+extern const char* GetCodeBrand(void);
+
+#endif /* CODEVERSION_H */

CommonInstall/DESIGN

@@ -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.