From 1ec4243477f664476074bce79e38fc3b64221f52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Thu, 18 Oct 2012 09:57:02 +0200 Subject: [PATCH] fix build on big endian arches --- ipmitool-1.8.12-bigendian2.patch | 17 +++++++++++++++++ ipmitool.spec | 10 ++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 ipmitool-1.8.12-bigendian2.patch diff --git a/ipmitool-1.8.12-bigendian2.patch b/ipmitool-1.8.12-bigendian2.patch new file mode 100644 index 0000000..c60d9de --- /dev/null +++ b/ipmitool-1.8.12-bigendian2.patch @@ -0,0 +1,17 @@ +diff -up ipmitool-1.8.12/lib/ipmi_delloem.c.bigendian2 ipmitool-1.8.12/lib/ipmi_delloem.c +--- ipmitool-1.8.12/lib/ipmi_delloem.c.bigendian2 2012-10-18 09:46:07.641569464 +0200 ++++ ipmitool-1.8.12/lib/ipmi_delloem.c 2012-10-18 09:46:23.471318242 +0200 +@@ -4283,10 +4283,10 @@ static int ipmi_set_power_cap(struct ipm + } + #if WORDS_BIGENDIAN + ipmipowercap.PowerCap = BSWAP_16(ipmipowercap.PowerCap); +- ipmipowercap.MaximumPowerConsump = BSWAP_16(ipmipowercap.MaximumPowerConsump); +- ipmipowercap.MinumumPowerConsump = BSWAP_16(ipmipowercap.MinimumPowerConsump); ++ ipmipowercap.MaximumPowerConsmp = BSWAP_16(ipmipowercap.MaximumPowerConsmp); ++ ipmipowercap.MinimumPowerConsmp = BSWAP_16(ipmipowercap.MinimumPowerConsmp); + ipmipowercap.AvailablePower = BSWAP_16(ipmipowercap.AvailablePower); +- ipmipowercap.totalnumpowersupp = BSWP_16(ipmipowercap.totalnumpowersupp); ++ ipmipowercap.totalnumpowersupp = BSWAP_16(ipmipowercap.totalnumpowersupp); + #endif + + memset(data, 0, 13); diff --git a/ipmitool.spec b/ipmitool.spec index b49a05e..1f44d0a 100644 --- a/ipmitool.spec +++ b/ipmitool.spec @@ -1,7 +1,7 @@ Name: ipmitool Summary: Utility for IPMI control Version: 1.8.12 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Group: System Environment/Base URL: http://ipmitool.sourceforge.net/ @@ -21,9 +21,11 @@ Patch1: ipmitool-1.8.10-ipmievd-init.patch Patch2: ipmitool-1.8.10-ipmievd-condrestart.patch Patch3: ipmitool-1.8.11-remove-umask0.patch Patch4: ipmitool-1.8.11-systemd.patch -# https://sourceforge.net/tracker/index.php?func=detail&aid=3564701&group_id=95200&atid=610550 +# https://sourceforge.net/tracker/?func=detail&aid=3564701&group_id=95200&atid=610550 Patch5: ipmitool-1.8.12-bigendian.patch Patch6: ipmitool-cvs-mc-sysinfo-dell.patch +# https://sourceforge.net/tracker/?func=detail&aid=3578022&group_id=95200&atid=610550 +Patch7: ipmitool-1.8.12-bigendian2.patch %description This package contains a utility for interfacing with devices that support @@ -49,6 +51,7 @@ setting LAN configuration, and chassis power control. %patch4 -p1 -b .systemd %patch5 -p1 -b .bigendian %patch6 -p1 -b .mcsysinfodell +%patch7 -p1 -b .bigendian2 for f in AUTHORS ChangeLog; do iconv -f iso-8859-1 -t utf8 < ${f} > ${f}.utf8 @@ -99,6 +102,9 @@ install -Dpm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/ipmievd %changelog +* Thu Oct 18 2012 Dan Horák - 1.8.12-5 +- fix build on big endian arches + * Wed Oct 17 2012 Ales Ledvinka 1.8.12-4 - support setting OS name and Hostname on BMC