Permalink
Browse files

OS-1520 ipmitool should be using patches

  • Loading branch information...
1 parent 9412039 commit 132ebfda5b4d25e13b0df251600fdd95107166e0 @richlowe richlowe committed with rmustacc Aug 31, 2012
View
2 ipmitool/Makefile
@@ -32,6 +32,8 @@ AUTOCONF_ENV += \
LD=/usr/bin/ld \
INSTALL="ginstall -c"
+PATCHES += ipmitool-enable-openipmi.diff
+PATCHES += ipmitool-smartos-devname.diff
PATCHES += ipmitool-nosfw.diff
include ../Makefile.targ
View
BIN ipmitool/ipmitool-1.8.11.tar.gz
Binary file not shown.
View
19 ipmitool/ipmitool-enable-openipmi.diff
@@ -0,0 +1,19 @@
+diff -ru ipmitool-1.8.11/configure.in ipmitool-1.8.11-joyent/configure.in
+--- ipmitool-1.8.11/configure.in 2009-02-25 15:38:51.000000000 -0500
++++ ipmitool-1.8.11-joyent/configure.in 2012-04-23 12:01:34.000000000 -0400
+@@ -63,14 +63,8 @@
+ # openssl libs are in /usr/sfw/lib on solaris 10
+ LIBS="$LIBS -R/usr/sfw/lib"
+ # disable the linux-specific interfaces
+- # and bmc on SPARC (there is no bmc driver for SPARC)
+- if [[ `mach -p` = sparc ]]; then
+- enable_intf_bmc=no
+- else
+- enable_intf_bmc=yes
+- fi
++ enable_intf_bmc=no
+ enable_intf_imb=no
+- enable_intf_open=no
+ enable_intf_lipmi=no
+ enable_ipmishell=no
+ enable_all_options=no
View
12 ipmitool/ipmitool-smartos-devname.diff
@@ -0,0 +1,12 @@
+diff -ru ipmitool-1.8.11/src/plugins/open/open.c ipmitool-1.8.11-joyent/src/plugins/open/open.c
+--- ipmitool-1.8.11/src/plugins/open/open.c 2009-02-25 15:38:53.000000000 -0500
++++ ipmitool-1.8.11-joyent/src/plugins/open/open.c 2012-04-23 12:01:58.000000000 -0400
+@@ -78,7 +78,7 @@
+
+ devnum = intf->devnum;
+
+- sprintf(ipmi_dev, "/dev/ipmi%d", devnum);
++ sprintf(ipmi_dev, "/dev/ipmi");
+ sprintf(ipmi_devfs, "/dev/ipmi/%d", devnum);
+ sprintf(ipmi_devfs2, "/dev/ipmidev/%d", devnum);
+ lprintf(LOG_DEBUG, "Using ipmi device %d", devnum);

0 comments on commit 132ebfd

Please sign in to comment.