xCAT/xcat-dep
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-dep.git synced 2024-11-22 01:21:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8 from zet809/modify_ipmitool_version

Browse Source 
Add patch that close sol client immediately after sol session is shut…
This commit is contained in:
Xiaopeng Wang 2016-07-18 17:05:14 +08:00 committed by GitHub
commit d2b579f520
5 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipmitool/bldipmi.pl
View File

@ -93,7 +93,7 @@ if (! grep /libcrypto.so/, @output) {
exit 1;
}
my $objrpm = "$blddir/RPMS/$arch/ipmitool-xcat-$version-1.$arch.rpm";
my $objrpm = "$blddir/RPMS/$arch/ipmitool-xcat-$version-2.$arch.rpm";
my $dstdir = "/tmp/build/$os/$arch";
# check the build result

7
ipmitool/debian/changelog
View File

@ -1,7 +1,12 @@
ipmitool-xcat (1.8.15-2) unstable; urgency=low
* To close sol session after no more data get from server side
-- zhaoertao <ertaozh@cn.ibm.com> Thu, 30 Jun 2016 13:58:00 +0100
ipmitool-xcat (1.8.15-1) unstable; urgency=low
* Delete user prompt to upgrade firmware
-- chenglch <chenglch@cn.ibm.com> Web, 4 Nov 2015 23:08:00 +0100
-- chenglch <chenglch@cn.ibm.com> Wed, 4 Nov 2015 23:08:00 +0100
ipmitool-xcat (1.8.11-1) unstable; urgency=low
* Changed to ipmitool-xcat

1
ipmitool/debian/patches/series
View File

@ -1,2 +1,3 @@
ipmitool-1.8.15-saneretry.patch
ipmitool-1.8.15-rflash.patch
ipmitool-1.8.15-solactivate.patch

13
ipmitool/ipmitool-1.8.15-solactivate.patch Normal file
View File

@ -0,0 +1,13 @@
diff -uNr ipmitool-1.8.15/lib/ipmi_sol.c ipmitool-1.8.15-solactivate/lib/ipmi_sol.c
--- ipmitool-1.8.15/lib/ipmi_sol.c 2014-10-23 15:41:13.000000000 -0400
+++ ipmitool-1.8.15-solactivate/lib/ipmi_sol.c 2016-07-12 03:57:28.418316917 -0400
@@ -1648,6 +1648,9 @@
{
output(rs);
}
+ else {
+ bShouldExit = bBmcClosedSession = 1;
+ }
/*
* Should recv_sol come back null, the incoming packet was not ours.
* Just fall through, the keepalive logic will determine if

4
ipmitool/ipmitool.spec
View File

@ -1,13 +1,14 @@
Name: ipmitool-xcat
Summary: ipmitool - Utility for IPMI control
Version: 1.8.15
Release: 1
Release: 2
License: BSD
Group: Utilities
Packager: IBM Corp.
Source: ipmitool-%{version}.tar.gz
Patch: ipmitool-%{version}-saneretry.patch
Patch2: ipmitool-%{version}-rflash.patch
Patch3: ipmitool-%{version}-solactivate.patch
Buildroot: /var/tmp/ipmitool-root
%description
@ -33,6 +34,7 @@ fi
%setup -n ipmitool-%{version}
%patch -p1
%patch2 -p1
%patch3 -p1
%build
./configure --with-kerneldir \