diff options
| author | Matthew Johnson <mjj29@hecate.matthew.ath.cx> | 2008-12-08 21:47:27 +0000 |
|---|---|---|
| committer | Matthew Johnson <mjj29@hecate.matthew.ath.cx> | 2008-12-08 21:47:27 +0000 |
| commit | fb34ee691791a6cf346066c229c65a0dc6087bf5 (patch) | |
| tree | 9a45ed411ddfec9fa58cf42e99963d0b47880390 | |
| parent | 7b2df9554c5624af4e2955163077b5a0e677eac1 (diff) | |
add patch from kibi to fix regression from etch
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/patches/00list | 1 | ||||
| -rw-r--r-- | debian/patches/20_ipmi_sdr.dpatch | 24 |
3 files changed, 34 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 86ace23..0cb479e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +ipmitool (1.8.9-3) unstable; urgency=low + + * Make sdr/Temperatures reading working again (Closes: #507760): + - Add patch to revert some bits from 1.8.8 to 1.8.9: + 20_ipmi_sdr.dpatch (Patch from Cyril Brulebois + <cyril.brulebois@kerlabs.com>) + + -- Matthew Johnson <mjj29@debian.org> Mon, 08 Dec 2008 21:45:20 +0000 + ipmitool (1.8.9-2) unstable; urgency=low * Bump Standards-Version diff --git a/debian/patches/00list b/debian/patches/00list index 3b14fa3..878c6c3 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,3 +1,4 @@ 10_ipmi_lanp.dpatch 20_ipmi_isol.dpatch 20_ipmi_impi.dpatch +20_ipmi_sdr.dpatch diff --git a/debian/patches/20_ipmi_sdr.dpatch b/debian/patches/20_ipmi_sdr.dpatch new file mode 100644 index 0000000..4e6ff4f --- /dev/null +++ b/debian/patches/20_ipmi_sdr.dpatch @@ -0,0 +1,24 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_ipmi_sdr.dpatch by Cyril Brulebois <cyril.brulebois@kerlabs.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Enable reading temperatures again (Closes: #507760). + +@DPATCH@ + +--- a/lib/ipmi_sdr.c ++++ b/lib/ipmi_sdr.c +@@ -1122,6 +1122,13 @@ + } else if (IS_SCANNING_DISABLED(rsp->data[1])) { + /* Sensor Scanning Disabled */ + validread = 0; ++ if (rsp->data[0] != 0) { ++ /* we might still get a valid reading */ ++ val = sdr_convert_sensor_reading(sensor, ++ rsp->data[0]); ++ if (val != 0.0) ++ validread = 1; ++ } + } else if (rsp->data[0] != 0) { + /* convert RAW reading into units */ + val = sdr_convert_sensor_reading(sensor, rsp->data[0]); |