[ipmitool] Removed the extra symbols in the patch, as the build is failing.

Praveen K Paladugu praveenp at fedoraproject.org
Thu Dec 13 22:41:21 UTC 2012


commit d5f74a5089db719a525e102884ec6d9a93aeded6
Author: praveenp <praveen_paladugu at dell.com>
Date:   Thu Dec 13 16:41:07 2012 -0600

    Removed the extra symbols in the patch, as the build is failing.

 ipmitool-1.8.12f-toolman.patch |   20 ++++++++++----------
 ipmitool.spec                  |    5 ++++-
 2 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/ipmitool-1.8.12f-toolman.patch b/ipmitool-1.8.12f-toolman.patch
index 7367c43..d3f2de9 100644
--- a/ipmitool-1.8.12f-toolman.patch
+++ b/ipmitool-1.8.12f-toolman.patch
@@ -2376,21 +2376,21 @@ diff -up ./lib/ipmi_main.c.manscan ./lib/ipmi_main.c
 +	lprintf(LOG_NOTICE, "       -b channel     Set destination channel for bridged request");
 +	lprintf(LOG_NOTICE, "       -B channel     Set transit channel for bridged request (dual bridge)");
 +#ifdef ENABLE_ALL_OPTIONS
-+*	lprintf(LOG_NOTICE, "       -c             Display output in comma separated format");
++	lprintf(LOG_NOTICE, "       -c             Display output in comma separated format");
 +#endif
  	lprintf(LOG_NOTICE, "       -C ciphersuite Cipher suite to be used by lanplus interface");
 +#ifdef ENABLE_ALL_OPTIONS
-+*	lprintf(LOG_NOTICE, "       -d N           Specify a /dev/ipmiN device to use (default=0)");
++	lprintf(LOG_NOTICE, "       -d N           Specify a /dev/ipmiN device to use (default=0)");
 +#endif
 +	lprintf(LOG_NOTICE, "       -e char        Set SOL escape character");
 +	lprintf(LOG_NOTICE, "       -E             Read password from IPMI_PASSWORD environment variable");
 +#ifdef ENABLE_ALL_OPTIONS
-+*	lprintf(LOG_NOTICE, "       -f file        Read remote session password from file");
++	lprintf(LOG_NOTICE, "       -f file        Read remote session password from file");
 +#endif
 +	lprintf(LOG_NOTICE, "       -g             Deprecated. Use: -o intelwv2");
 +#ifdef ENABLE_ALL_OPTIONS
-+*	lprintf(LOG_NOTICE, "       -h             This help");
-+*	lprintf(LOG_NOTICE, "       -H hostname    Remote host name for LAN interface");
++	lprintf(LOG_NOTICE, "       -h             This help");
++	lprintf(LOG_NOTICE, "       -H hostname    Remote host name for LAN interface");
 +#endif
 +	lprintf(LOG_NOTICE, "       -I intf        Interface to use");
  	lprintf(LOG_NOTICE, "       -k key         Use Kg key for IPMIv2 authentication");
@@ -2415,20 +2415,20 @@ diff -up ./lib/ipmi_main.c.manscan ./lib/ipmi_main.c
  	lprintf(LOG_NOTICE, "       -O seloem      Use file for OEM SEL event descriptions");
 -	lprintf(LOG_NOTICE, "       -N seconds     Specify timeout for lan [default=2] / lanplus [default=1] interface");
 +#ifdef ENABLE_ALL_OPTIONS
-+*	lprintf(LOG_NOTICE, "       -p port        Remote RMCP port [default=623]");
++	lprintf(LOG_NOTICE, "       -p port        Remote RMCP port [default=623]");
 +#endif
 +	lprintf(LOG_NOTICE, "       -P password    Remote session password");
  	lprintf(LOG_NOTICE, "       -R retry       Set the number of retries for lan/lanplus interface [default=4]");
 +	lprintf(LOG_NOTICE, "       -s             Deprecated. Use: -o supermicro");
 +#ifdef ENABLE_ALL_OPTIONS
-+*	lprintf(LOG_NOTICE, "       -S sdr         Use local file for remote SDR cache");
++	lprintf(LOG_NOTICE, "       -S sdr         Use local file for remote SDR cache");
  #endif
 +	lprintf(LOG_NOTICE, "       -t address     Bridge request to remote target address");
 +	lprintf(LOG_NOTICE, "       -T address     Set transit address for bridge request (dual bridge)");
 +#ifdef ENABLE_ALL_OPTIONS
-+*	lprintf(LOG_NOTICE, "       -U username    Remote session username");
-+*	lprintf(LOG_NOTICE, "       -v             Verbose (can use multiple times)");
-+*	lprintf(LOG_NOTICE, "       -V             Show version information");
++	lprintf(LOG_NOTICE, "       -U username    Remote session username");
++	lprintf(LOG_NOTICE, "       -v             Verbose (can use multiple times)");
++	lprintf(LOG_NOTICE, "       -V             Show version information");
 +#endif
 +	lprintf(LOG_NOTICE, "       -y hex_key     Use hexadecimal-encoded Kg key for IPMIv2 authentication");
 +	lprintf(LOG_NOTICE, "       -Y             Prompt for the Kg key for IPMIv2 authentication");
diff --git a/ipmitool.spec b/ipmitool.spec
index 58ee06c..fe2e193 100644
--- a/ipmitool.spec
+++ b/ipmitool.spec
@@ -1,7 +1,7 @@
 Name:         ipmitool
 Summary:      Utility for IPMI control
 Version:      1.8.12
-Release:      11%{?dist}
+Release:      12%{?dist}
 License:      BSD
 Group:        System Environment/Base
 URL:          http://ipmitool.sourceforge.net/
@@ -159,6 +159,9 @@ install -Dm 755 %{SOURCE6} %{buildroot}%{_libexecdir}/exchange-bmc-os-info
 
 
 %changelog
+* Thu Dec 13 2012 Praveen K Paladugu <praveen_paladugu at dell.com> - 1.8.12-12
+- Removed the extra symbols in the patch, as the build is failing.
+
 * Thu Dec 13 2012 Praveen K Paladugu <praveen_paladugu at dell.com> - 1.8.12-11
 - Subpackage for exchange-bmc-os-info as it requires OPenIPMI
 


More information about the scm-commits mailing list