Rebase to 3.6.0
This commit is contained in:
Ondřej Lysoněk
parent
03187ba4f1
commit
6ec338c54b
1
.gitignore
vendored
1
.gitignore
vendored
@ -10,3 +10,4 @@ lm_sensors-3.1.2.tar.bz2
|
||||
/lm_sensors-3.4.0.tar.bz2
|
||||
/lm-sensors-70f7e0848410b9ca4dde7abff669bbbecbf137e0.tar.gz
|
||||
/lm-sensors-3-5-0.tar.gz
|
||||
/lm-sensors-3-6-0.tar.gz
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
From ed560047401c73571a65707ea2eec5c33ac77d4a Mon Sep 17 00:00:00 2001
|
||||
From: Luca Stefani <luca.stefani.ge1@gmail.com>
|
||||
Date: Thu, 25 Jul 2019 23:49:39 +0200
|
||||
Subject: [PATCH] Add support for Nuvoton NCT6797D Super IO Sensors
|
||||
|
||||
---
|
||||
prog/detect/sensors-detect | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
|
||||
index bb62068e..cb0a401d 100755
|
||||
--- a/prog/detect/sensors-detect
|
||||
+++ b/prog/detect/sensors-detect
|
||||
@@ -2336,6 +2336,13 @@ use constant FEAT_SMBUS => (1 << 7);
|
||||
devid_mask => 0xFFF0,
|
||||
logdev => 0x0b,
|
||||
features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
|
||||
+ }, {
|
||||
+ name => "Nuvoton NCT6797D Super IO Sensors",
|
||||
+ driver => "nct6775",
|
||||
+ devid => 0xD450,
|
||||
+ devid_mask => 0xFFF0,
|
||||
+ logdev => 0x0b,
|
||||
+ features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
|
||||
}, {
|
||||
name => "Nuvoton NCT6102D/NCT6104D/NCT6106D Super IO Sensors",
|
||||
driver => "nct6775",
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
From 782a2124b60837c981b61c2f6a5d4501d4e0f964 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
|
||||
Date: Thu, 10 Jan 2019 15:09:24 +0100
|
||||
Subject: [PATCH] sensors-detect: Add detection of AMD Family 17h model 30h
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Kernel support was added in mainline commit 210ba1201ff95.
|
||||
|
||||
Signed-off-by: Ondřej Lysoněk <olysonek@redhat.com>
|
||||
---
|
||||
prog/detect/sensors-detect | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
|
||||
index 0b3b0ff2..4fa4c03e 100755
|
||||
--- a/prog/detect/sensors-detect
|
||||
+++ b/prog/detect/sensors-detect
|
||||
@@ -2773,7 +2773,7 @@ use vars qw(@cpu_ids);
|
||||
}, {
|
||||
name => "AMD Family 17h thermal sensors",
|
||||
driver => "k10temp",
|
||||
- detect => sub { amd_pci_detect('1463', '15d0') },
|
||||
+ detect => sub { amd_pci_detect('1463', '15d0', '1493') },
|
||||
}, {
|
||||
name => "AMD Family 15h power sensors",
|
||||
driver => "fam15h_power",
|
||||
--
|
||||
2.17.2
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
From 00e7d37b35f6264fc3c121db47fbcc1e90010d89 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
|
||||
Date: Tue, 23 Jul 2019 11:51:02 +0200
|
||||
Subject: [PATCH] sensors-detect: Add detection of AMD family 17h, model 70h
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
k10temp support was added in groeck/hwmon-next commit
|
||||
22cac1016a4831922d2.
|
||||
|
||||
Fixes #187
|
||||
|
||||
Signed-off-by: Ondřej Lysoněk <olysonek@redhat.com>
|
||||
---
|
||||
prog/detect/sensors-detect | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
|
||||
index bb2e93d3..bb62068e 100755
|
||||
--- a/prog/detect/sensors-detect
|
||||
+++ b/prog/detect/sensors-detect
|
||||
@@ -2773,7 +2773,7 @@ use vars qw(@cpu_ids);
|
||||
}, {
|
||||
name => "AMD Family 17h thermal sensors",
|
||||
driver => "k10temp",
|
||||
- detect => sub { amd_pci_detect('1463', '15d0', '1493') },
|
||||
+ detect => sub { amd_pci_detect('1463', '15d0', '1493', '1443') },
|
||||
}, {
|
||||
name => "AMD Family 15h power sensors",
|
||||
driver => "fam15h_power",
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: lm_sensors
|
||||
Version: 3.5.0
|
||||
Release: 6%{?dist}
|
||||
Version: 3.6.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Hardware monitoring tools
|
||||
|
||||
%define upstream_version %(echo %{version} | sed -e 's/\\./-/g')
|
||||
@ -26,12 +26,6 @@ Source7: lm_sensors.service
|
||||
|
||||
# Downstream-only:
|
||||
Patch0: 0001-Revert-unnecessary-soname-bump.patch
|
||||
# Upstream patch:
|
||||
Patch1: 0001-sensors-detect-Add-detection-of-AMD-Family-17h-model.patch
|
||||
# Upstream patch:
|
||||
Patch2: 0001-Add-support-for-Nuvoton-NCT6797D-Super-IO-Sensors.patch
|
||||
# Upstream patch:
|
||||
Patch3: 0001-sensors-detect-Add-detection-of-AMD-family-17h-model.patch
|
||||
|
||||
Requires: /usr/sbin/modprobe
|
||||
%ifarch %{ix86} x86_64
|
||||
@ -85,9 +79,6 @@ database, and warns of sensor alarms.
|
||||
%prep
|
||||
%setup -q -n lm-sensors-%{upstream_version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
# Remove currently unused files to make sure we've got the license right
|
||||
rm -f prog/init/sysconfig-lm_sensors-convert prog/hotplug/unhide_ICH_SMBus
|
||||
@ -208,6 +199,9 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Oct 18 2019 Ondřej Lysoněk <olysonek@redhat.com> - 3.6.0-1
|
||||
- New version
|
||||
|
||||
* Thu Aug 15 2019 Ondřej Lysoněk <olysonek@redhat.com> - 3.5.0-6
|
||||
- Add detection support for AMD family 17h model 70h
|
||||
- Add detection support for Nuvoton NCT6797D
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (lm-sensors-3-5-0.tar.gz) = bea9b2ac01bc43622cafdce0b00ac3bb8cb2d818449c8b332ab51e7ad0022b66bcbf6ca1e99c8500bdc6092c5c1ef985bfe7cff05dbcf015bd3ccf58c00a72e1
|
||||
SHA512 (lm-sensors-3-6-0.tar.gz) = 4e80361913aff5403f1f0737fd4f42cffe43cc170ef48fff3914c9952f71990739d723f7b0b8120d9a01bcbbc829e964cfbd0a5cf18508af8f8dc825b49860bf
|
||||
|
||||
Loading…
Reference in New Issue
Block a user