From e41bc25363abf9c18a3fab61bf65c0715d983695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= Date: Mon, 25 Jun 2018 14:37:25 +0200 Subject: [PATCH] New version The official lm_sensors site has been down for a while now, using Guenter Roeck's mirror repo. --- .gitignore | 1 + ...tection-of-AMD-Ryzen-w-Vega-graphics.patch | 27 ------------------- ...etect-AMD-Family-17h-thermal-sensors.patch | 27 ------------------- lm_sensors.spec | 23 +++++++++------- sources | 2 +- 5 files changed, 16 insertions(+), 64 deletions(-) delete mode 100644 0001-Add-detection-of-AMD-Ryzen-w-Vega-graphics.patch delete mode 100644 0001-Detect-AMD-Family-17h-thermal-sensors.patch diff --git a/.gitignore b/.gitignore index 20b2662..a7ba6ba 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ lm_sensors-3.1.2.tar.bz2 /lm_sensors-3.3.4.tar.bz2 /lm_sensors-3.3.5.tar.bz2 /lm_sensors-3.4.0.tar.bz2 +/lm-sensors-70f7e0848410b9ca4dde7abff669bbbecbf137e0.tar.gz diff --git a/0001-Add-detection-of-AMD-Ryzen-w-Vega-graphics.patch b/0001-Add-detection-of-AMD-Ryzen-w-Vega-graphics.patch deleted file mode 100644 index ae3d0e3..0000000 --- a/0001-Add-detection-of-AMD-Ryzen-w-Vega-graphics.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c874e11639b6fd4002b155f7414f54f632465ec1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= -Date: Thu, 3 May 2018 12:41:41 +0200 -Subject: [PATCH] Add detection of AMD Ryzen w/ Vega graphics - -Kernel support was added in commit -https://github.com/torvalds/linux/commit/877d8948d0aa402fb ---- - 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 9b399e74..0d1cbb5d 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') }, -+ detect => sub { amd_pci_detect('1463', '15d0') }, - }, { - name => "AMD Family 15h power sensors", - driver => "fam15h_power", --- -2.14.3 - diff --git a/0001-Detect-AMD-Family-17h-thermal-sensors.patch b/0001-Detect-AMD-Family-17h-thermal-sensors.patch deleted file mode 100644 index aa1cf4a..0000000 --- a/0001-Detect-AMD-Family-17h-thermal-sensors.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f7d7997cf41bb0e1db0fb300073b434e0ea7dcc3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= -Date: Fri, 20 Apr 2018 16:24:24 +0200 -Subject: [PATCH] Detect AMD Family 17h thermal sensors - ---- - prog/detect/sensors-detect | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect -index 6013aa3..f522b95 100755 ---- a/prog/detect/sensors-detect -+++ b/prog/detect/sensors-detect -@@ -2532,6 +2532,10 @@ use vars qw(@cpu_ids); - name => "AMD Family 16h thermal sensors", - driver => "k10temp", - detect => sub { amd_pci_detect('1533', '1583') }, -+ }, { -+ name => "AMD Family 17h thermal sensors", -+ driver => "k10temp", -+ detect => sub { amd_pci_detect('1463') }, - }, { - name => "AMD Family 15h power sensors", - driver => "fam15h_power", --- -2.14.3 - diff --git a/lm_sensors.spec b/lm_sensors.spec index 7eb46fa..228990c 100644 --- a/lm_sensors.spec +++ b/lm_sensors.spec @@ -1,13 +1,20 @@ +%global commit 70f7e0848410b9ca4dde7abff669bbbecbf137e0 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global year 2018 +%global month 05 +%global day 22 +%global date %{year}%{month}%{day} + Name: lm_sensors Version: 3.4.0 -Release: 14%{?dist} +Release: 15.%{date}git%{shortcommit}%{?dist} Summary: Hardware monitoring tools Group: Applications/System License: LGPLv2+ and GPLv3+ and GPLv2+ and Verbatim and Public Domain -URL: http://www.lm-sensors.org/ +URL: http://github.com/groeck/lm-sensors/ -Source: http://dl.lm-sensors.org/lm-sensors/releases/%{name}-%{version}.tar.bz2 +Source0: http://github.com/groeck/lm-sensors/archive/%{commit}/lm-sensors-%{commit}.tar.gz Source1: lm_sensors.sysconfig # these 2 were taken from PLD-linux, Thanks! Source2: sensord.sysconfig @@ -17,9 +24,6 @@ Source5: sensord.service Source6: sensord-service-wrapper Source7: lm_sensors.service -Patch1: 0001-Detect-AMD-Family-17h-thermal-sensors.patch -Patch2: 0001-Add-detection-of-AMD-Ryzen-w-Vega-graphics.patch - Requires: /usr/sbin/modprobe %ifarch %{ix86} x86_64 Requires: /usr/sbin/dmidecode @@ -65,9 +69,7 @@ database, and warns of sensor alarms. %prep -%setup -q -%patch1 -p1 -%patch2 -p1 +%setup -q -n lm-sensors-%{commit} mv prog/init/README prog/init/README.initscripts chmod -x prog/init/fancontrol.init @@ -186,6 +188,9 @@ fi %changelog +* Mon Jun 25 2018 Ondřej Lysoněk - 3.4.0-15.20180522git70f7e08 +- New version + * Fri May 04 2018 Ondřej Lysoněk - 3.4.0-14 - Add detection of AMD Ryzen w/ Vega graphics - Resolves: rhbz#1573399 diff --git a/sources b/sources index 9e24c6d..9f385a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c03675ae9d43d60322110c679416901a lm_sensors-3.4.0.tar.bz2 +SHA512 (lm-sensors-70f7e0848410b9ca4dde7abff669bbbecbf137e0.tar.gz) = 90a17af6f70e7588b2214a8beb69e51d96a2fe09be6fc19c0fb1d2e8c4c911cd5dc0487637dc7aa5e45cf92382a11d32344487a682e88bd1918b73986954c69d