pool/sensors
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 39642 from Base:System

Browse Source 
checked in (request 39642)

OBS-URL: https://build.opensuse.org/request/show/39642
OBS-URL: https://build.opensuse.org/package/show/Base:System/sensors?expand=0&rev=22
This commit is contained in:
OBS User autobuild 2010-05-07 13:39:49 +00:00 committed by Git OBS Bridge
parent 06ea52ede7
commit 2561ca7181
3 changed files with 0 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
lm_sensors-r5835-fix-sensord-regression.patch
View File

@ -1,55 +0,0 @@
Fix support of multiple chips.
Index: lm-sensors/prog/sensord/rrd.c
===================================================================
--- lm-sensors/prog/sensord/rrd.c (revision 5793)
+++ lm-sensors/prog/sensord/rrd.c (revision 5835)
@@ -138,7 +138,9 @@
}
+/* Returns the number of features processed, or -1 on error */
static int _applyToFeatures(FeatureFN fn, void *data,
const sensors_chip_name *chip,
- const ChipDescriptor *desc)
+ const ChipDescriptor *desc,
+ int labelOffset)
{
int i;
@@ -148,5 +150,5 @@
char *label;
- for (i = 0; i < MAX_RRD_SENSORS && features[i].format; ++i) {
+ for (i = 0; labelOffset + i < MAX_RRD_SENSORS && features[i].format; ++i) {
feature = features + i;
rawLabel = feature->feature->name;
@@ -159,9 +161,9 @@
}
- rrdCheckLabel(rawLabel, i);
- fn(data, rrdLabels[i], label, feature);
+ rrdCheckLabel(rawLabel, labelOffset + i);
+ fn(data, rrdLabels[labelOffset + i], label, feature);
free(label);
}
- return 0;
+ return i;
}
@@ -185,5 +187,5 @@
static int applyToFeatures(FeatureFN fn, void *data)
{
- int i, i_detected, ret;
+ int i, i_detected, ret, labelOffset = 0;
const sensors_chip_name *chip, *chip_arg;
ChipDescriptor *desc;
@@ -198,7 +200,8 @@
continue;
- ret = _applyToFeatures(fn, data, chip, desc);
- if (ret)
+ ret = _applyToFeatures(fn, data, chip, desc, labelOffset);
+ if (ret < 0)
return ret;
+ labelOffset += ret;
}
}

7
sensors.changes
View File

@ -1,10 +1,3 @@
-------------------------------------------------------------------
Fri May 7 11:48:40 CEST 2010 - jdelvare@suse.de
- lm_sensors-r5835-fix-sensord-regression.patch: Fix regression
in sensord (support for multiple chips was broken by release
3.1.2). Fixes upstream ticket #2377.
-------------------------------------------------------------------
Tue Apr 13 13:08:07 CEST 2010 - jdelvare@suse.de

2
sensors.spec
View File

@ -37,7 +37,6 @@ Patch3: lm_sensors-3.0.0-sysconfig_metadata.patch
Patch4: lm_sensors-3.0.3-hint-at-kernel-extra-package.patch
Patch5: lm_sensors-3.1.1-no-ipmisensors-driver.patch
Patch6: lm_sensors-r5832-adt7468-driver.patch
Patch7: lm_sensors-r5835-fix-sensord-regression.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExcludeArch: s390 s390x
@ -141,7 +140,6 @@ Authors:
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%build
RPM_OPT_FLAGS="$RPM_OPT_FLAGS"