components/ipmitool/patches/openipmi.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 10 Dec 2012 13:30:55 -0800
changeset 1077 17d2fc72ab7f
parent 589 beabcdec3918
permissions -rw-r--r--
Close of build 11.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
589
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
     1
Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
     2
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
     3
--- ipmitool-1.8.11.old/configure.in	Tue Oct 25 12:43:52 2011
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
     4
+++ ipmitool-1.8.11/configure.in	Tue Oct 25 12:46:49 2011
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
     5
@@ -65,7 +65,7 @@
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
     6
 	# disable the linux-specific interfaces
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
     7
 	enable_intf_bmc=yes
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
     8
 	enable_intf_imb=no
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
     9
-	enable_intf_open=no
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    10
+	enable_intf_open=yes
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    11
 	enable_intf_lipmi=no
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    12
 	enable_ipmishell=no
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    13
 	enable_all_options=no
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    14
@@ -219,6 +219,10 @@
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    15
 		[Define to 1 if you have the <sys/ipmi.h> header file.])],
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    16
 		[echo "** Unable to find OpenIPMI header files.  Using internal version."])])
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    17
 
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    18
+AC_CHECK_HEADER([sys/ioccom.h],
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    19
+	[AC_DEFINE(HAVE_IOCCOM_H, [1],
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    20
+	[Define to 1 if you have the <sys/ioccom.h> header file.])])
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    21
+
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    22
 dnl look for FreeIPMI files
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    23
 AC_CHECK_LIB(freeipmi, ipmi_open_inband, [have_free=yes], [have_free=no])
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    24
 if test "x$have_free" != "xyes"; then
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    25
--- ipmitool-1.8.11.old/src/ipmievd.c	Wed Feb 25 12:38:52 2009
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    26
+++ ipmitool-1.8.11/src/ipmievd.c	Fri Oct 21 16:41:54 2011
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    27
@@ -66,6 +66,10 @@
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    28
 #  include <sys/poll.h>
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    29
 #endif /* IPMI_INTF_OPEN */
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    30
 
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    31
+#ifdef HAVE_IOCCOM_H
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    32
+#include <sys/ioccom.h>
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    33
+#endif
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    34
+
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    35
 #include <ipmitool/helper.h>
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    36
 #include <ipmitool/log.h>
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    37
 #include <ipmitool/ipmi.h>
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    38
--- ipmitool-1.8.11.old/src/plugins/open/open.c	Wed Feb 25 12:38:53 2009
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    39
+++ ipmitool-1.8.11/src/plugins/open/open.c	Fri Oct 21 16:41:08 2011
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    40
@@ -62,6 +62,10 @@
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    41
 # include "open.h"
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    42
 #endif
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    43
 
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    44
+#ifdef HAVE_IOCCOM_H
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    45
+#include <sys/ioccom.h>
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    46
+#endif
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    47
+
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    48
 extern int verbose;
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    49
 
beabcdec3918 6978267 Integration of ipmitool 1.8.11
henryzh <henry.zhao@oracle.com>
parents:
diff changeset
    50
 static int