jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-31 14:37:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

lm_sensors: update to lm_sensors-3.3.0

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2011-03-29 14:59:08 +02:00
parent 5f1d7d95d6
commit 1c9fdd5394
8 changed files with 1 additions and 274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/sysutils/lm_sensors/meta
View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="lm_sensors" PKG_NAME="lm_sensors"
PKG_VERSION="3.2.0" PKG_VERSION="3.3.0"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

22
packages/sysutils/lm_sensors/patches/lm_sensors-3.2.0-changeset_5870.patch
View File

@ -1,22 +0,0 @@
diff -Naur lm_sensors-3.2.0-old/CHANGES lm_sensors-3.2.0-new/CHANGES
--- lm_sensors-3.2.0-old/CHANGES 2010-10-10 12:15:54.000000000 -0700
+++ lm_sensors-3.2.0-new/CHANGES 2010-10-19 20:13:47.000000000 -0700
@@ -2,6 +2,7 @@
-----------------------
3.2.0 (2010-10-10)
+ sensors-detect: Fix error seen if I2C bus numbers are not sequential
libsensors: Increase MAX_SENSORS_PER_TYPE to 24
Map individual beep features
Change license to LGPL
diff -Naur lm_sensors-3.2.0-old/prog/detect/sensors-detect lm_sensors-3.2.0-new/prog/detect/sensors-detect
--- lm_sensors-3.2.0-old/prog/detect/sensors-detect 2010-09-21 08:21:05.000000000 -0700
+++ lm_sensors-3.2.0-new/prog/detect/sensors-detect 2010-10-19 20:13:47.000000000 -0700
@@ -5930,6 +5930,7 @@
# the adapter drivers so that the numbers will be the same. If not, then
# we only load the adapter drivers which are useful.
foreach $adap (@i2c_adapters) {
+ next unless defined $adap;
next if $adap->{autoload};
next if $adap->{driver} eq 'UNKNOWN';
next if not defined $configfile and not $adap->{used};

12
packages/sysutils/lm_sensors/patches/lm_sensors-3.2.0-changeset_5883.patch
View File

@ -1,12 +0,0 @@
diff -Naur lm_sensors-3.2.0-old/prog/detect/sensors-detect lm_sensors-3.2.0-new/prog/detect/sensors-detect
--- lm_sensors-3.2.0-old/prog/detect/sensors-detect 2010-11-21 07:20:09.000000000 -0800
+++ lm_sensors-3.2.0-new/prog/detect/sensors-detect 2010-11-21 07:21:05.000000000 -0800
@@ -1791,7 +1791,7 @@
features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
}, {
name => "Nuvoton W83667HG-B Super IO Sensors",
- driver => "to-be-written", # Probably w83627ehf
+ driver => "w83627ehf",
devid => 0xB350,
devid_mask => 0xFFF0,
logdev => 0x0b,

40
packages/sysutils/lm_sensors/patches/lm_sensors-3.2.0-changeset_5886.patch
View File

@ -1,40 +0,0 @@
diff -Naur lm_sensors-3.2.0-old/CHANGES lm_sensors-3.2.0-new/CHANGES
--- lm_sensors-3.2.0-old/CHANGES 2010-11-29 10:42:35.000000000 -0800
+++ lm_sensors-3.2.0-new/CHANGES 2010-11-29 10:43:06.000000000 -0800
@@ -4,6 +4,7 @@
3.2.0 (2010-10-10)
sensors-detect: Fix error seen if I2C bus numbers are not sequential
libsensors: Increase MAX_SENSORS_PER_TYPE to 24
+ sensors.conf.defauit: Add a section for the W83627THF
Map individual beep features
Change license to LGPL
pwmconfig: Sample all fan speeds before returning to full speed (#2380)
diff -Naur lm_sensors-3.2.0-old/etc/sensors.conf.default lm_sensors-3.2.0-new/etc/sensors.conf.default
--- lm_sensors-3.2.0-old/etc/sensors.conf.default 2010-07-04 00:22:11.000000000 -0700
+++ lm_sensors-3.2.0-new/etc/sensors.conf.default 2010-11-29 10:43:06.000000000 -0800
@@ -266,6 +266,25 @@
label temp1 "M/B Temp"
+chip "w83627thf-*"
+
+ label in3 "+5V"
+ label in7 "5VSB"
+ label in8 "Vbat"
+
+ # Internal resistors
+ compute in3 @ * (1 + 34/51), @ / (1 + 34/51)
+ compute in7 @ * (1 + 34/51), @ / (1 + 34/51)
+
+ set in3_min 5.0 * 0.90
+ set in3_max 5.0 * 1.10
+ set in7_min 5.0 * 0.90
+ set in7_max 5.0 * 1.10
+# The battery voltage may or may not be monitored.
+# set in8_min 3.0 * 0.90
+# set in8_max 3.0 * 1.10
+
+
chip "w83627ehf-*" "w83627dhg-*" "w83667hg-*"
label in0 "Vcore"

12
packages/sysutils/lm_sensors/patches/lm_sensors-3.2.0-changeset_5887.patch
View File

@ -1,12 +0,0 @@
diff -Naur lm_sensors-3.2.0-old/lib/sensors.conf.5 lm_sensors-3.2.0-new/lib/sensors.conf.5
--- lm_sensors-3.2.0-old/lib/sensors.conf.5 2009-02-15 09:22:38.000000000 -0800
+++ lm_sensors-3.2.0-new/lib/sensors.conf.5 2010-12-13 18:45:54.000000000 -0800
@@ -402,7 +402,7 @@
again immediately.
So, in addition to tempX_max, many chips have a tempX_max_hyst
-sub-feature. Likewise, tempX_crit often comes with tempX_max_crit.
+sub-feature. Likewise, tempX_crit often comes with tempX_crit_hyst.
Example:
.RS

35
packages/sysutils/lm_sensors/patches/lm_sensors-3.2.0-changeset_5889.patch
View File

@ -1,35 +0,0 @@
diff -Naur lm_sensors-3.2.0-old/CHANGES lm_sensors-3.2.0-new/CHANGES
--- lm_sensors-3.2.0-old/CHANGES 2010-12-13 18:45:21.000000000 -0800
+++ lm_sensors-3.2.0-new/CHANGES 2010-12-13 18:46:50.000000000 -0800
@@ -5,6 +5,7 @@
sensors-detect: Fix error seen if I2C bus numbers are not sequential
libsensors: Increase MAX_SENSORS_PER_TYPE to 24
sensors.conf.defauit: Add a section for the W83627THF
+ Add a section for the SCH5127
Map individual beep features
Change license to LGPL
pwmconfig: Sample all fan speeds before returning to full speed (#2380)
diff -Naur lm_sensors-3.2.0-old/etc/sensors.conf.default lm_sensors-3.2.0-new/etc/sensors.conf.default
--- lm_sensors-3.2.0-old/etc/sensors.conf.default 2010-12-13 18:45:21.000000000 -0800
+++ lm_sensors-3.2.0-new/etc/sensors.conf.default 2010-12-13 18:46:50.000000000 -0800
@@ -402,6 +402,20 @@
set in6_max 3.0 * 1.10
+chip "sch5127-*"
+
+ label in2 "+3.3V"
+ label in5 "3VSB"
+ label in6 "Vbat"
+
+ set in2_min 3.3 * 0.90
+ set in2_max 3.3 * 1.10
+ set in5_min 3.3 * 0.90
+ set in5_max 3.3 * 1.10
+ set in6_min 3.0 * 0.90
+ set in6_max 3.0 * 1.10
+
+
chip "f71882fg-*"
label in0 "+3.3V"

140
packages/sysutils/lm_sensors/patches/lm_sensors-3.2.0-changeset_5905.patch
View File

@ -1,140 +0,0 @@
diff -Naur lm_sensors-3.2.0-old/CHANGES lm_sensors-3.2.0-new/CHANGES
--- lm_sensors-3.2.0-old/CHANGES 2011-01-19 19:04:13.000000000 -0800
+++ lm_sensors-3.2.0-new/CHANGES 2011-01-19 19:04:29.000000000 -0800
@@ -18,6 +18,7 @@
Add support for Intel PCH (SMBus)
Add support for SMSC EMC1403 and EMC1404
Fix detection of RB-C3 AMD Family 10h CPU
+ Implement universal detection for coretemp
Add support for SMSC EMC2103
Add support for Fintek F71889ED
Add support for ITE IT8721F
diff -Naur lm_sensors-3.2.0-old/prog/detect/sensors-detect lm_sensors-3.2.0-new/prog/detect/sensors-detect
--- lm_sensors-3.2.0-old/prog/detect/sensors-detect 2011-01-19 19:04:13.000000000 -0800
+++ lm_sensors-3.2.0-new/prog/detect/sensors-detect 2011-01-19 19:04:29.000000000 -0800
@@ -23,7 +23,7 @@
require 5.004;
use strict;
-use Fcntl;
+use Fcntl qw(:DEFAULT :seek);
use File::Basename;
# We will call modprobe, which typically lives in either /sbin,
@@ -2025,13 +2025,9 @@
driver => "k10temp",
detect => \&fam11h_pci_detect,
}, {
- name => "Intel Core family thermal sensor",
+ name => "Intel digital thermal sensor",
driver => "coretemp",
- detect => sub { coretemp_detect(0); },
- }, {
- name => "Intel Atom thermal sensor",
- driver => "coretemp",
- detect => sub { coretemp_detect(1); },
+ detect => \&coretemp_detect,
}, {
name => "Intel AMB FB-DIMM thermal sensor",
driver => "i5k_amb",
@@ -2293,10 +2289,10 @@
while (<INPUTFILE>) {
if (m/^processor\s*:\s*(\d+)/) {
push @cpu, $entry if scalar keys(%{$entry}); # Previous entry
- $entry = {}; # New entry
+ $entry = { nr => $1 }; # New entry
next;
}
- if (m/^(vendor_id|cpu family|model|model name|stepping)\s*:\s*(.+)$/) {
+ if (m/^(vendor_id|cpu family|model|model name|stepping|cpuid level)\s*:\s*(.+)$/) {
my $k = $1;
my $v = $2;
$v =~ s/\s+/ /g; # Merge multiple spaces
@@ -2465,6 +2461,15 @@
$modules_list{$normalized} = 1;
}
+# udev may take some time to create device nodes when loading modules
+sub udev_settle
+{
+ if (!(-x "/sbin/udevadm" && system("/sbin/udevadm settle") == 0)
+ && !(-x "/sbin/udevsettle" && system("/sbin/udevsettle") == 0)) {
+ sleep(1);
+ }
+}
+
sub initialize_modules_supported
{
foreach my $chip (@chip_ids) {
@@ -5754,23 +5759,33 @@
return;
}
+sub cpuid
+{
+ my ($cpu_nr, $eax) = @_;
+
+ sysopen(CPUID, "/dev/cpu/$cpu_nr/cpuid", O_RDONLY) or return;
+ binmode CPUID;
+ sysseek(CPUID, $eax, SEEK_SET)
+ or die "Cannot seek /dev/cpu/$cpu_nr/cpuid";
+ sysread(CPUID, my $data, 16)
+ or die "Cannot read /dev/cpu/$cpu_nr/cpuid";
+ close CPUID;
+
+ return unpack("L4", $data);
+}
+
sub coretemp_detect
{
- my $chip = shift;
my $probecpu;
foreach $probecpu (@cpu) {
next unless $probecpu->{vendor_id} eq 'GenuineIntel' &&
- $probecpu->{'cpu family'} == 6;
- return 9 if $chip == 0 &&
- ($probecpu->{model} == 14 || # Pentium M DC
- $probecpu->{model} == 15 || # Core 2 DC 65nm
- $probecpu->{model} == 0x16 || # Core 2 SC 65nm
- $probecpu->{model} == 0x17 || # Penryn 45nm
- $probecpu->{model} == 0x1a || # Nehalem
- $probecpu->{model} == 0x1e); # Lynnfield
- return 9 if $chip == 1 &&
- ($probecpu->{model} == 0x1c); # Atom
+ $probecpu->{'cpuid level'} >= 6;
+
+ # Now we check for the DTS flag
+ my @regs = cpuid($probecpu->{nr}, 6);
+ return unless @regs == 4;
+ return 9 if ($regs[0] & (1 << 0)); # eax, bit 0
}
return;
}
@@ -6124,6 +6139,12 @@
print "Some south bridges, CPUs or memory controllers contain embedded sensors.\n".
"Do you want to scan for them? This is totally safe. (YES/no): ";
unless (<STDIN> =~ /^\s*n/i) {
+ # Load the cpuid driver if needed
+ unless (-e "/dev/cpu/$cpu[0]->{nr}/cpuid") {
+ load_module("cpuid");
+ udev_settle();
+ }
+
$| = 1;
foreach my $entry (@cpu_ids) {
scan_cpu($entry);
@@ -6199,12 +6220,7 @@
$by_default = 1 if dmi_match('board_vendor', 'asustek', 'tyan',
'supermicro');
- # udev may take some time to create the device node
- if (!(-x "/sbin/udevadm" && system("/sbin/udevadm settle") == 0)
- && !(-x "/sbin/udevsettle" && system("/sbin/udevsettle") == 0)) {
- sleep(1);
- }
-
+ udev_settle();
for (my $dev_nr = 0; $dev_nr < @i2c_adapters; $dev_nr++) {
next unless exists $i2c_adapters[$dev_nr];
scan_i2c_adapter($dev_nr, $by_default);

12
packages/sysutils/lm_sensors/patches/lm_sensors-3.2.0-changeset_5913.patch
View File

@ -1,12 +0,0 @@
diff -Naur lm_sensors-3.2.0-old/etc/sensors.conf.default lm_sensors-3.2.0-new/etc/sensors.conf.default
--- lm_sensors-3.2.0-old/etc/sensors.conf.default 2011-02-07 19:37:38.000000000 -0800
+++ lm_sensors-3.2.0-new/etc/sensors.conf.default 2011-02-07 19:38:19.000000000 -0800
@@ -285,7 +285,7 @@
# set in8_max 3.0 * 1.10
-chip "w83627ehf-*" "w83627dhg-*" "w83667hg-*"
+chip "w83627ehf-*" "w83627dhg-*" "w83667hg-*" "nct6775-*" "nct6776-*"
label in0 "Vcore"
label in2 "AVCC"