- lm_sensors-r6216-fancontrol-moving-hwmon-attributes.patch:
fancontrol: Deal with moving hwmon attributes. - lm_sensors-r6237-default-config-NCT6779-NCT6791.patch: sensors.conf.default: Add support for NCT6779 and NCT6791. - lm_sensors-r6254-detect-print-kernel-cpu.patch: Print kernel version and processor information. - lm_sensors-r6255-fix-shell-error-FCFANS.patch: fancontrol: Fix shell error when FCFANS is not set (bnc#903520). OBS-URL: https://build.opensuse.org/package/show/Base:System/sensors?expand=0&rev=82
This commit is contained in:
Jean Delvare
Git OBS Bridge
parent
3b4e5e06b0
commit
caff03032d
91
lm_sensors-r6216-fancontrol-moving-hwmon-attributes.patch
Normal file
91
lm_sensors-r6216-fancontrol-moving-hwmon-attributes.patch
Normal file
@ -0,0 +1,91 @@
|
||||
From: Jean Delvare <jdelvare@suse.de>
|
||||
Subject: fancontrol: Deal with moving hwmon attributes
|
||||
Upstream: Committed (http://www.lm-sensors.org/changeset/6216)
|
||||
|
||||
Several kernel drivers have already moved their attributes from the
|
||||
hardware device to the hwmon class device, and others will follow.
|
||||
Teach fancontrol about this possibility and let it adjust the attribute
|
||||
paths transparently.
|
||||
---
|
||||
prog/pwm/fancontrol | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 63 insertions(+)
|
||||
|
||||
--- lm_sensors-3.3.5.orig/prog/pwm/fancontrol 2014-11-05 11:39:50.709481711 +0100
|
||||
+++ lm_sensors-3.3.5/prog/pwm/fancontrol 2014-11-05 11:39:55.983598361 +0100
|
||||
@@ -206,6 +206,65 @@ function ValidateDevices()
|
||||
return $outdated
|
||||
}
|
||||
|
||||
+function FixupDeviceFiles
|
||||
+{
|
||||
+ local DEVICE="$1"
|
||||
+ local fcvcount pwmo tsen fan
|
||||
+
|
||||
+ let fcvcount=0
|
||||
+ while (( $fcvcount < ${#AFCPWM[@]} )) # go through all pwm outputs
|
||||
+ do
|
||||
+ pwmo=${AFCPWM[$fcvcount]}
|
||||
+ AFCPWM[$fcvcount]=${pwmo//$DEVICE\/device/$DEVICE}
|
||||
+ if [ "${AFCPWM[$fcvcount]}" != "$pwmo" ]
|
||||
+ then
|
||||
+ echo "Adjusing $pwmo -> ${AFCPWM[$fcvcount]}"
|
||||
+ fi
|
||||
+ let fcvcount=$fcvcount+1
|
||||
+ done
|
||||
+
|
||||
+ let fcvcount=0
|
||||
+ while (( $fcvcount < ${#AFCTEMP[@]} )) # go through all temp inputs
|
||||
+ do
|
||||
+ tsen=${AFCTEMP[$fcvcount]}
|
||||
+ AFCTEMP[$fcvcount]=${tsen//$DEVICE\/device/$DEVICE}
|
||||
+ if [ "${AFCTEMP[$fcvcount]}" != "$tsen" ]
|
||||
+ then
|
||||
+ echo "Adjusing $tsen -> ${AFCTEMP[$fcvcount]}"
|
||||
+ fi
|
||||
+ let fcvcount=$fcvcount+1
|
||||
+ done
|
||||
+
|
||||
+ let fcvcount=0
|
||||
+ while (( $fcvcount < ${#AFCFAN[@]} )) # go through all fan inputs
|
||||
+ do
|
||||
+ fan=${AFCFAN[$fcvcount]}
|
||||
+ AFCFAN[$fcvcount]=${fan//$DEVICE\/device/$DEVICE}
|
||||
+ if [ "${AFCFAN[$fcvcount]}" != "$fan" ]
|
||||
+ then
|
||||
+ echo "Adjusing $fan -> ${AFCFAN[$fcvcount]}"
|
||||
+ fi
|
||||
+ let fcvcount=$fcvcount+1
|
||||
+ done
|
||||
+}
|
||||
+
|
||||
+# Some drivers moved their attributes from hard device to class device
|
||||
+function FixupFiles
|
||||
+{
|
||||
+ local DEVPATH="$1"
|
||||
+ local entry device
|
||||
+
|
||||
+ for entry in $DEVPATH
|
||||
+ do
|
||||
+ device=`echo "$entry" | sed -e 's/=[^=]*$//'`
|
||||
+
|
||||
+ if [ -e "$device/name" ]
|
||||
+ then
|
||||
+ FixupDeviceFiles "$device"
|
||||
+ fi
|
||||
+ done
|
||||
+}
|
||||
+
|
||||
# Check that all referenced sysfs files exist
|
||||
function CheckFiles
|
||||
{
|
||||
@@ -306,6 +365,10 @@ then
|
||||
echo "Configuration appears to be outdated, please run pwmconfig again" >&2
|
||||
exit 1
|
||||
fi
|
||||
+if [ "$DIR" = "/sys/class/hwmon" ]
|
||||
+then
|
||||
+ FixupFiles "$DEVPATH"
|
||||
+fi
|
||||
CheckFiles || exit 1
|
||||
|
||||
if [ -f "$PIDFILE" ]
|
||||
18
lm_sensors-r6237-default-config-NCT6779-NCT6791.patch
Normal file
18
lm_sensors-r6237-default-config-NCT6779-NCT6791.patch
Normal file
@ -0,0 +1,18 @@
|
||||
From: Jean Delvare <jdelvare@suse.de>
|
||||
Subject: sensors.conf.default: Add support for NCT6779 and NCT6791
|
||||
Upstream: Committed (http://www.lm-sensors.org/changeset/6237)
|
||||
---
|
||||
etc/sensors.conf.default | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- lm_sensors-3.3.5.orig/etc/sensors.conf.default 2014-11-05 11:39:50.625479853 +0100
|
||||
+++ lm_sensors-3.3.5/etc/sensors.conf.default 2014-11-05 11:39:56.157602209 +0100
|
||||
@@ -308,7 +308,7 @@ chip "w83627thf-*"
|
||||
# set in8_max 3.0 * 1.10
|
||||
|
||||
|
||||
-chip "w83627ehf-*" "w83627dhg-*" "w83667hg-*" "nct6775-*" "nct6776-*"
|
||||
+chip "w83627ehf-*" "w83627dhg-*" "w83667hg-*" "nct6775-*" "nct6776-*" "nct6779-*" "nct6791-*"
|
||||
|
||||
label in0 "Vcore"
|
||||
label in2 "AVCC"
|
||||
46
lm_sensors-r6254-detect-print-kernel-cpu.patch
Normal file
46
lm_sensors-r6254-detect-print-kernel-cpu.patch
Normal file
@ -0,0 +1,46 @@
|
||||
From: Jean Delvare <jdelvare@suse.de>
|
||||
Subject: Print kernel version and processor information
|
||||
Upstream: Committed (http://www.lm-sensors.org/changeset/6254)
|
||||
|
||||
Print the kernel version and the processor information, to make user
|
||||
support easier.
|
||||
---
|
||||
prog/detect/sensors-detect | 13 +++++++++++++
|
||||
1 file changed, 13 insertions(+)
|
||||
|
||||
--- lm_sensors-3.3.5.orig/prog/detect/sensors-detect 2014-11-05 11:39:50.581478880 +0100
|
||||
+++ lm_sensors-3.3.5/prog/detect/sensors-detect 2014-11-05 11:39:56.331606058 +0100
|
||||
@@ -2688,6 +2688,11 @@ sub initialize_kernel_version
|
||||
}
|
||||
}
|
||||
|
||||
+sub print_kernel_version
|
||||
+{
|
||||
+ printf "# Kernel: \%d.\%d.\%d\%s \%s\n", @kernel_version, $kernel_arch;
|
||||
+}
|
||||
+
|
||||
sub kernel_version_at_least
|
||||
{
|
||||
my ($vers, $plvl, $slvl) = @_;
|
||||
@@ -2732,6 +2737,12 @@ sub initialize_cpu_list
|
||||
push @cpu, $entry if scalar keys(%{$entry}); # Last entry
|
||||
}
|
||||
|
||||
+sub print_cpu_info
|
||||
+{
|
||||
+ my $cpu = $cpu[0];
|
||||
+ print "# Processor: $cpu->{'model name'} ($cpu->{'cpu family'}/$cpu->{model}/$cpu->{stepping})\n";
|
||||
+}
|
||||
+
|
||||
# @i2c_adapters is a list of references to hashes, one hash per I2C/SMBus
|
||||
# adapter present on the system. Each entry has the following keys: path,
|
||||
# parent, name (directly taken from sysfs), driver and autoload.
|
||||
@@ -6908,6 +6919,8 @@ sub main
|
||||
print "# sensors-detect revision $revision\n";
|
||||
initialize_dmi_data();
|
||||
print_dmi_summary();
|
||||
+ print_kernel_version();
|
||||
+ print_cpu_info();
|
||||
print "\n";
|
||||
|
||||
if ($opt{auto}) {
|
||||
23
lm_sensors-r6255-fix-shell-error-FCFANS.patch
Normal file
23
lm_sensors-r6255-fix-shell-error-FCFANS.patch
Normal file
@ -0,0 +1,23 @@
|
||||
From: Jean Delvare <jdelvare@suse.de>
|
||||
Subject: fancontrol: Fix shell error when FCFANS is not set
|
||||
Upstream: Committed (http://www.lm-sensors.org/changeset/6255)
|
||||
References: bnc#903520
|
||||
|
||||
The bug was introduced when I added support for multiple fans
|
||||
controlled by the same PWM output, in r6000. lm-sensors versions
|
||||
affected: 3.3.2 to 3.3.5.
|
||||
---
|
||||
prog/pwm/fancontrol | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
--- lm_sensors-3.3.5.orig/prog/pwm/fancontrol 2014-11-05 11:39:55.983598361 +0100
|
||||
+++ lm_sensors-3.3.5/prog/pwm/fancontrol 2014-11-05 11:39:56.500609796 +0100
|
||||
@@ -513,7 +513,7 @@ function UpdateFanSpeeds
|
||||
fi
|
||||
done
|
||||
else
|
||||
- fanval=1 # set it to a non zero value, so the rest of the script still works
|
||||
+ min_fanval=1 # set it to a non zero value, so the rest of the script still works
|
||||
fi
|
||||
|
||||
# debug info
|
||||
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 5 10:43:57 UTC 2014 - jdelvare@suse.com
|
||||
|
||||
- lm_sensors-r6216-fancontrol-moving-hwmon-attributes.patch:
|
||||
fancontrol: Deal with moving hwmon attributes.
|
||||
- lm_sensors-r6237-default-config-NCT6779-NCT6791.patch:
|
||||
sensors.conf.default: Add support for NCT6779 and NCT6791.
|
||||
- lm_sensors-r6254-detect-print-kernel-cpu.patch: Print kernel
|
||||
version and processor information.
|
||||
- lm_sensors-r6255-fix-shell-error-FCFANS.patch: fancontrol: Fix
|
||||
shell error when FCFANS is not set (bnc#903520).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 3 11:25:08 UTC 2014 - jdelvare@suse.com
|
||||
|
||||
|
||||
@ -35,6 +35,10 @@ Patch1: lm_sensors-3.1.1-build.patch
|
||||
Patch2: lm_sensors-3.0.0-sensord-separate.patch
|
||||
Patch3: lm_sensors-3.0.0-sysconfig_metadata.patch
|
||||
Patch4: lm_sensors-3.0.3-hint-at-kernel-extra-package.patch
|
||||
Patch5: lm_sensors-r6216-fancontrol-moving-hwmon-attributes.patch
|
||||
Patch6: lm_sensors-r6237-default-config-NCT6779-NCT6791.patch
|
||||
Patch7: lm_sensors-r6254-detect-print-kernel-cpu.patch
|
||||
Patch8: lm_sensors-r6255-fix-shell-error-FCFANS.patch
|
||||
|
||||
ExcludeArch: s390 s390x
|
||||
%{?systemd_requires}
|
||||
@ -96,6 +100,10 @@ sense to the user.
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
|
||||
%build
|
||||
RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user