Skip to content

Commit

Permalink
Merge pull request #33 from cornelisnetworks/upstream-10.11.1.3
Browse files Browse the repository at this point in the history 
Update to latest from build 10.11.1.3.1 (OPXS 10.11.1.3.1)
  • Loading branch information
@gregkresge-cornelisnetworks
gregkresge-cornelisnetworks committed Apr 6, 2022
2 parents 06b0d04 + 178636f commit 37c1b40
Show file tree
Hide file tree
Showing 78 changed files with 569 additions and 1,594 deletions.
6 changes: 3 additions & 3 deletions CommonInstall/DESIGN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
74 changes: 56 additions & 18 deletions CommonInstall/Makefile
View file
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
32 changes: 30 additions & 2 deletions CommonInstall/comp_delta.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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' );
Expand All @@ -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
Expand Down Expand Up @@ -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" ) {
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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));
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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));
Expand All @@ -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;
}
Expand Down
150 changes: 0 additions & 150 deletions CommonInstall/comp_delta_prereq_RHEL72.pl
View file

This file was deleted.

Loading

0 comments on commit 37c1b40

Please sign in to comment.