Commit 8113beaa authored by Scott Breyer's avatar Scott Breyer

Update to latest from build 10.9.0.2.1

parent 46667698
......@@ -1220,10 +1220,6 @@ sub preinstall_intel_hfi($$)
return preinstall_delta("intel_hfi", $install_list, $installing_list);
}
my $irq_perm_string = "Set IrqBalance to Exact?";
AddAnswerHelp("IrqBalance", "$irq_perm_string");
my $Default_IrqBalance = 1;
sub install_intel_hfi($$)
{
my $install_list = shift(); # total that will be installed when done
......@@ -1232,27 +1228,6 @@ sub install_intel_hfi($$)
print_comp_install_banner('intel_hfi');
setup_env("OPA_INSTALL_CALLER", 1);
# Adjust irqbalance
if ( -e "/etc/sysconfig/irqbalance" ) {
print "Intel strongly recommends that the irqbalance service be enabled\n";
print "and run using the --hintpolicy=exact option.\n";
$Default_IrqBalance = GetYesNoWithMemory("IrqBalance", 1, "$irq_perm_string", "y");
if ( $Default_IrqBalance == 1 ) {
#set env variable so that RPM can do post install configuration of IRQBALANCE
# if opasystemconfig already exists, set it manually
if ( -f "/sbin/opasystemconfig" ) {
system("/sbin/opasystemconfig --enable Irq_Balance");
} else {
setup_env("OPA_IRQBALANCE", 1);
}
} else {
if ( -f "/sbin/opasystemconfig" ) {
system("/sbin/opasystemconfig --disable Irq_Balance");
} else {
setup_env("OPA_IRQBALANCE", 0);
}
}
}
install_comp_rpms('intel_hfi', " -U --nodeps ", $install_list);
need_reboot();
......
......@@ -295,67 +295,4 @@ sub enable_mod_force_load($)
}
}
my $OPA_IRQBALANCE_FILE = "/etc/sysconfig/irqbalance";
my $OPA_IRQBALANCE_BAK = "/etc/sysconfig/irqbalance.bak";
sub set_opairqbalance()
{
print "Updating $ROOT$OPA_IRQBALANCE_FILE\n";
# Look up the current arguments. Note that this may be an empty string.
my ($original_line) = `egrep -e '^IRQBALANCE_ARGS=' $ROOT$OPA_IRQBALANCE_FILE`;
chomp($original_line);
if ($original_line =~ /--hintpolicy=exact/ || $original_line =~ /-h exact/) {
# Already set to exact. No action is needed.
} else {
# Make a backup.
copy_data_file("$ROOT$OPA_IRQBALANCE_FILE", "$ROOT/$OPA_IRQBALANCE_BAK");
# Replace the existing hint policy with the new one.
my ($original_args) = $original_line;
$original_args =~ s/IRQBALANCE_ARGS=//;
$original_args =~ s/["']//g;
my ($new_args) = $original_args;
$new_args =~ s/--hintpolicy=[a-z]*//;
$new_args =~ s/-h [a-z]*//;
$new_args = "$new_args --hintpolicy=exact";
if ($original_line eq "") {
# If there were no arguments in the existing file, just append.
open (OUTPUT, ">>$ROOT$OPA_IRQBALANCE_FILE");
select (OUTPUT);
print "IRQBALANCE_ARGS=$new_args\n";
select(STDOUT);
close(OUTPUT);
} else {
# Otherwise, rewrite the existing line.
open (INPUT, "$ROOT$OPA_IRQBALANCE_BAK");
open (OUTPUT, ">$ROOT$OPA_IRQBALANCE_FILE");
select (OUTPUT);
while (($_=<INPUT>)) {
if (/^$original_line/) {
print "# $_";
print "IRQBALANCE_ARGS=$new_args\n";
} else {
print $_;
}
}
select(STDOUT);
close (INPUT);
close (OUTPUT);
unlink("$ROOT$OPA_IRQBALANCE_BAK");
}
}
# Make sure irqbalance is enabled and started.
if (substr($CUR_OS_VER,0,3) eq "2.6") {
`/sbin/chkconfig irqbalance on; service irqbalance restart`
}
else {
`systemctl enable irqbalance; systemctl restart irqbalance`
}
}
# Adjust the environment variables if necessary
export PRODUCT=OPENIB_FF
export RELEASE_TAG=10_9_0_0_204
export RELEASE_TAG=10_9_0_2_1
export BUILD_CONFIG=${BUILD_CONFIG:-"release"}
export BUILD_WITH_STACK=OPENIB
Build of OPENIB_FF 11/12/18 23:55 Tag: OPENIB_FF_LINUX_opa-10_9_10_9_0_0_204
Build of OPENIB_FF 02/05/19 11:27 Tag: OPENIB_FF_LINUX_opa-10_9_0_2_10_9_0_2_1
Name: opa
Version: 10.9.0.0
Release: 204%{?dist}
Version: 10.9.0.2
Release: 1%{?dist}
Summary: Intel Omni-Path basic tools and libraries for fabric managment.
Group: System Environment/Libraries
......@@ -18,7 +18,7 @@ __RPM_DEBUG_PKG
%description
This package contains the tools necessary to manage an Intel(R) Omni-Path Architecture fabric.
IFSComponent: Tools_FF 10.9.0.0.204%{?dist}
IFSComponent: Tools_FF 10.9.0.2.1%{?dist}
%package basic-tools
Summary: Managment level tools and scripts.
......@@ -35,7 +35,7 @@ Epoch: 1
%description basic-tools
Contains basic tools for fabric managment necessary on all compute nodes.
IFSComponent: Tools_FF 10.9.0.0.204%{?dist}
IFSComponent: Tools_FF 10.9.0.2.1%{?dist}
%package fastfabric
Summary: Management level tools and scripts.
......@@ -48,7 +48,7 @@ Epoch: 1
%description fastfabric
Contains tools for managing fabric on a managment node.
IFSComponent: Tools_FF 10.9.0.0.204%{?dist}
IFSComponent: Tools_FF 10.9.0.2.1%{?dist}
%package address-resolution
Summary: Contains Address Resolution manager
......@@ -62,7 +62,7 @@ Epoch: 1
%description address-resolution
This package contains the ibacm distributed SA provider (dsap) for name and address resolution on OPA platform.
It also contains the library and tools to access the shared memory database exported by dsap.
IFSComponent: Tools_FF 10.9.0.0.204%{?dist}
IFSComponent: Tools_FF 10.9.0.2.1%{?dist}
#opasnapconfig
%package snapconfig
......@@ -73,7 +73,7 @@ Requires: opa-fastfabric
%description snapconfig
Parse information from provided snapshot file and issue packets to program
IFSComponent: Tools_FF 10.9.0.0.204%{?dist}
IFSComponent: Tools_FF 10.9.0.2.1%{?dist}
%package libopamgt
Summary: Omni-Path management API library
......@@ -82,7 +82,7 @@ Requires: __RPM_REQ_OPAMGT
%description libopamgt
This package contains the library necessary to build applications that interface with an Omni-Path FM.
IFSComponent: Tools_FF 10.9.0.0.204%{?dist}
IFSComponent: Tools_FF 10.9.0.2.1%{?dist}
%package libopamgt-devel
......@@ -92,7 +92,7 @@ Requires: __RPM_REQ_OPAMGT_DEV
%description libopamgt-devel
This package contains the necessary headers for opamgt development.
IFSComponent: Tools_FF 10.9.0.0.204%{?dist}
IFSComponent: Tools_FF 10.9.0.2.1%{?dist}
%prep
#rm -rf %{_builddir}/*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment