diff --git a/ipmitool/bldipmi.pl b/ipmitool/bldipmi.pl index 6315180..adf4ac1 100755 --- a/ipmitool/bldipmi.pl +++ b/ipmitool/bldipmi.pl @@ -37,12 +37,12 @@ if ( ! grep /openssl-devel|libopenssl/, @output ) { # check the source files my $pwd = `pwd`; +my $version = "1.8.15"; chomp($pwd); -if ( (! -f "$pwd/ipmitool-1.8.11.tar.gz") +if ( (! -f "$pwd/ipmitool-$version.tar.gz") || (! -f "$pwd/ipmitool.spec") - || (! -f "$pwd/ipmitool-saneretry.patch") - || (! -f "$pwd/ipmitool-spdfix.patch") - || (! -f "$pwd/ipmitool-eventfix.patch")) { + || (! -f "$pwd/ipmitool-$version-saneretry.patch") + || (! -f "$pwd/ipmitool-$version-rflash.patch")) { print "missed some necessary files for building.\n"; exit 1; } @@ -72,7 +72,7 @@ $cmd = "rm -rf $blddir/RPMS/$arch/ipmitool*"; &runcmd($cmd); # copy the build files -$cmd = "cp -rf ./ipmitool-1.8.11.tar.gz $blddir/SOURCES/"; +$cmd = "cp -rf ./ipmitool-$version.tar.gz $blddir/SOURCES/"; &runcmd($cmd); $cmd = "cp -rf ./*.patch $blddir/SOURCES/"; @@ -85,7 +85,7 @@ $cmd = "rpmbuild -bb $blddir/SPECS/ipmitool.spec"; &runcmd($cmd); #check whether the ssl has been enabled -my $binfile = "$blddir/BUILD/ipmitool-1.8.11/src/ipmitool"; +my $binfile = "$blddir/BUILD/ipmitool-$version/src/ipmitool"; $cmd = "ldd $binfile"; @output = `$cmd`; if (! grep /libcrypto.so/, @output) { @@ -93,7 +93,7 @@ if (! grep /libcrypto.so/, @output) { exit 1; } -my $objrpm = "$blddir/RPMS/$arch/ipmitool-xcat-1.8.11-3.$arch.rpm"; +my $objrpm = "$blddir/RPMS/$arch/ipmitool-xcat-$version-1.$arch.rpm"; my $dstdir = "/tmp/build/$os/$arch"; # check the build result diff --git a/ipmitool/debian/changelog b/ipmitool/debian/changelog index 77061e6..4f676f7 100644 --- a/ipmitool/debian/changelog +++ b/ipmitool/debian/changelog @@ -1,3 +1,8 @@ +ipmitool-xcat (1.8.15) unstable; urgency=low + * Changed to ipmitool-xcat + + -- chenglch Web, 4 Nov 2015 23:08:00 +0100 + ipmitool-xcat (1.8.11-1) unstable; urgency=low * Changed to ipmitool-xcat diff --git a/ipmitool/debian/patches/ipmitool-1.8.15-rflash.patch b/ipmitool/debian/patches/ipmitool-1.8.15-rflash.patch new file mode 120000 index 0000000..2e4ee09 --- /dev/null +++ b/ipmitool/debian/patches/ipmitool-1.8.15-rflash.patch @@ -0,0 +1 @@ +/opt/xcat-dep/ipmitool/ipmitool-1.8.15-rflash.patch \ No newline at end of file diff --git a/ipmitool/debian/patches/ipmitool-1.8.15-saneretry.patch b/ipmitool/debian/patches/ipmitool-1.8.15-saneretry.patch new file mode 120000 index 0000000..0335e5c --- /dev/null +++ b/ipmitool/debian/patches/ipmitool-1.8.15-saneretry.patch @@ -0,0 +1 @@ +/opt/xcat-dep/ipmitool/ipmitool-1.8.15-saneretry.patch \ No newline at end of file diff --git a/ipmitool/debian/patches/series b/ipmitool/debian/patches/series index 9d5b9f2..153671f 100644 --- a/ipmitool/debian/patches/series +++ b/ipmitool/debian/patches/series @@ -1,3 +1,2 @@ -ipmitool-saneretry.patch -ipmitool-spdfix.patch -ipmitool-eventfix.patch +ipmitool-1.8.15-saneretry.patch +ipmitool-1.8.15-rflash.patch diff --git a/ipmitool/ipmitool-1.8.15-rflash.patch b/ipmitool/ipmitool-1.8.15-rflash.patch new file mode 100644 index 0000000..a9983f7 --- /dev/null +++ b/ipmitool/ipmitool-1.8.15-rflash.patch @@ -0,0 +1,22 @@ +diff -uNr ipmitool-1.8.15/lib/ipmi_hpmfwupg.c ipmitool-rflash/lib/ipmi_hpmfwupg.c +--- ipmitool-1.8.15/lib/ipmi_hpmfwupg.c 2014-08-11 13:31:15.000000000 -0400 ++++ ipmitool-rflash/lib/ipmi_hpmfwupg.c 2015-11-03 02:39:22.022585519 -0500 +@@ -724,18 +724,6 @@ + lprintf(LOG_NOTICE, "\n Upgrade undesirable at this moment"); + return HPMFWUPG_ERROR; + } +- /* Get confimation from the user if he wants to continue when +- * service affected during upgrade +- */ +- if (!(option & COMPARE_MODE) +- && (pFwupgCtx->targetCap.GlobalCapabilities.bitField.servAffectDuringUpg == 1 +- || pImageHeader->imageCapabilities.bitField.servAffected == 1)) { +- if (HpmGetUserInput("\nServices may be affected during upgrade. Do you wish to continue? (y/n): ")) { +- rc = HPMFWUPG_SUCCESS; +- } else { +- return HPMFWUPG_ERROR; +- } +- } + } + /* Get the general properties of each component present in image */ + for (componentId = HPMFWUPG_COMPONENT_ID_0; diff --git a/ipmitool/ipmitool-1.8.15-saneretry.patch b/ipmitool/ipmitool-1.8.15-saneretry.patch new file mode 100644 index 0000000..f88546f --- /dev/null +++ b/ipmitool/ipmitool-1.8.15-saneretry.patch @@ -0,0 +1,59 @@ +diff -uNr ipmitool-1.8.15/lib/ipmi_sol.c ipmitool-1.8.15-saneretry/lib/ipmi_sol.c +--- ipmitool-1.8.15/lib/ipmi_sol.c 2014-10-23 15:41:13.000000000 -0400 ++++ ipmitool-1.8.15-saneretry/lib/ipmi_sol.c 2015-11-05 03:40:00.382585518 -0500 +@@ -71,7 +71,6 @@ + #define SOL_PARAMETER_SOL_PAYLOAD_CHANNEL 0x07 + #define SOL_PARAMETER_SOL_PAYLOAD_PORT 0x08 + +-#define MAX_SOL_RETRY 6 + + const struct valstr sol_parameter_vals[] = { + { SOL_PARAMETER_SET_IN_PROGRESS, "Set In Progress (0)" }, +@@ -92,7 +91,6 @@ + static int _in_raw_mode = 0; + static int _disable_keepalive = 0; + static int _use_sol_for_keepalive = 0; +-static int _keepalive_retries = 0; + + extern int verbose; + +@@ -1531,7 +1529,6 @@ + int retval; + int buffer_size = intf->session->sol_data.max_inbound_payload_size; + int keepAliveRet = 0; +- int retrySol = 0; + + /* Subtract SOL header from max_inbound_payload_size */ + if (buffer_size > 4) +@@ -1568,29 +1565,8 @@ + + if (keepAliveRet != 0) + { +- /* +- * Retrying the keep Alive before declaring a communication +- * lost state with the IPMC. Helpful when the payload is +- * reset and brings down the connection temporarily. Otherwise, +- * if we send getDevice Id to check the status of IPMC during +- * this down time when the connection is restarting, SOL will +- * exit even though the IPMC is available and the session is open. +- */ +- if (retrySol == MAX_SOL_RETRY) +- { +- /* no response to Get Device ID keepalive message */ +- bShouldExit = 1; +- continue; +- } +- else +- { +- retrySol++; +- } +- } +- else +- { +- /* if the keep Alive is successful reset retries to zero */ +- retrySol = 0; ++ bShouldExit = 1; ++ continue; + } + } /* !oem="i82571spt" */ + /* Wait up to half a second */ diff --git a/ipmitool/ipmitool-1.8.15.tar.gz b/ipmitool/ipmitool-1.8.15.tar.gz new file mode 100644 index 0000000..adad736 Binary files /dev/null and b/ipmitool/ipmitool-1.8.15.tar.gz differ diff --git a/ipmitool/ipmitool.spec b/ipmitool/ipmitool.spec index 95522e2..d6dc852 100644 --- a/ipmitool/ipmitool.spec +++ b/ipmitool/ipmitool.spec @@ -1,14 +1,13 @@ Name: ipmitool-xcat Summary: ipmitool - Utility for IPMI control -Version: 1.8.11 -Release: 3 +Version: 1.8.15 +Release: 1 License: BSD Group: Utilities -Packager: Jarrod Johnson +Packager: IBM Corp. Source: ipmitool-%{version}.tar.gz -Patch: ipmitool-saneretry.patch -Patch2: ipmitool-spdfix.patch -Patch3: ipmitool-eventfix.patch +Patch: ipmitool-%{version}-saneretry.patch +Patch2: ipmitool-%{version}-rflash.patch Buildroot: /var/tmp/ipmitool-root %description @@ -34,7 +33,6 @@ fi %setup -n ipmitool-%{version} %patch -p1 %patch2 -p1 -%patch3 -p1 %build ./configure --with-kerneldir \ @@ -64,6 +62,8 @@ fi %changelog +* Wed Nov 04 2015 1.8.15 + Delete rflash verification prompt * Wed Apr 27 2011 1.8.11-3 - Add event fix * Wed Mar 11 2009 1.8.11-2 diff --git a/ipmitool/make_deb.sh b/ipmitool/make_deb.sh index d1b5993..8c6813b 100755 --- a/ipmitool/make_deb.sh +++ b/ipmitool/make_deb.sh @@ -1,7 +1,8 @@ #!/bin/bash +VERSION=1.8.15 -tar xvfz ipmitool-1.8.11.tar.gz -cd ipmitool-1.8.11 +tar xvfz ipmitool-$VERSION.tar.gz +cd ipmitool-$VERSION cp -rL ../debian . HOST_ARCH=`uname -m` if [ "$HOST_ARCH" = "ppc64le" ]; then @@ -13,4 +14,5 @@ else fi TARGET_ARCH=$HOST_ARCH dpkg-buildpackage -uc -us cd - -rm -rf ipmitool-1.8.11 +rm -rf ipmitool-$VERSION +