diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..421d7cb --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/lm-sensors-70f7e0848410b9ca4dde7abff669bbbecbf137e0.tar.gz diff --git a/0001-Fix-stale-links-and-outdated-info.patch b/0001-Fix-stale-links-and-outdated-info.patch new file mode 100644 index 0000000..6f448f5 --- /dev/null +++ b/0001-Fix-stale-links-and-outdated-info.patch @@ -0,0 +1,486 @@ +From 90b9168cd44f8c641fcf10def830bcd7c53a30e9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= +Date: Sat, 1 Sep 2018 08:12:59 +0200 +Subject: [PATCH] Fix stale links and outdated info +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This combines several upstream commits, see below. + +(cherry picked from commit 6413b80847ec54792d026191c01cdb985441a28b) +(cherry picked from commit be3679ae06b622b1d868271ddeb6ae8d12196d1f) +(cherry picked from commit 17d62bd3180d01676834d8a901d9bb1216b2f979) +(cherry picked from commit 8f54fe85e8c9015190a2c80b8297ea69b5111728) +(cherry picked from commit 807f9b1529892c0ac89bca0c7ae781c59f9c8393) +(cherry picked from commit 255804953e039a725df47c596e47f68554118ca5) +(cherry picked from commit 012d76b9785b467cf219bf134d6610861de58a97) +(cherry picked from commit 84f773b3ec8b75f377a68fd1436ea3ac6d11b170) + +Resolves: rhbz#1693347 + +Signed-off-by: Ondřej Lysoněk +--- + CHANGES | 4 +++- + Makefile | 2 +- + README | 18 ++++++++++++----- + configs/Asus/P3-PH4C.conf | 3 ++- + configs/Asus/P5B-E.conf | 2 +- + configs/Asus/P5N32-E_SLI_Plus.conf | 2 +- + configs/Biostar/N68S+.conf | 2 +- + configs/Gigabyte/Z38MX-UD2H-B3.conf | 2 +- + doc/developers/lm_sensors.lsm | 10 ++++------ + doc/developers/release_checklist | 30 ++++++++--------------------- + doc/donations | 2 +- + doc/git | 2 +- + doc/progs | 2 +- + etc/sensors.conf.eg | 4 ++-- + lib/libsensors.3 | 3 +-- + lib/sensors.conf.5 | 5 +---- + prog/detect/sensors-detect | 6 +++--- + prog/dump/isadump.8 | 2 +- + prog/dump/isaset.8 | 2 +- + prog/init/lm_sensors.init | 2 +- + prog/rrd/sens_day.in | 2 +- + prog/rrd/sens_week.in | 2 +- + prog/rrd/summ_week.in | 2 +- + prog/sensord/rrd.c | 3 ++- + prog/sensors/sensors.1 | 2 +- + prog/tellerstats/index.shtml | 2 +- + version.h | 2 +- + 27 files changed, 56 insertions(+), 64 deletions(-) + +diff --git a/CHANGES b/CHANGES +index 6efba0fd..d2e7e8d4 100644 +--- a/CHANGES ++++ b/CHANGES +@@ -1,7 +1,9 @@ + lm-sensors CHANGES file + ----------------------- + +-SVN HEAD ++git HEAD ++ Development version string now contains "+git" instead of "+SVN" ++ Updated links in documentation to reflect the new home of lm_sensors + sensors.1: Add reference to sensors-detect + Document -j option (json output) + sensors: Add support for json output +diff --git a/Makefile b/Makefile +index d6f2192c..2f5859f0 100644 +--- a/Makefile ++++ b/Makefile +@@ -226,7 +226,7 @@ manhtml: + cp $(MANPAGES) html + cd html ; \ + export LOGNAME=sensors ; \ +- export HOSTNAME=www.lm-sensors.org ; \ ++ export HOSTNAME=hwmon.wiki.kernel.org ; \ + man2html *.[1-8] ; \ + $(RM) *.[1-8] + +diff --git a/README b/README +index acd3c6e4..9ce510b9 100644 +--- a/README ++++ b/README +@@ -101,14 +101,22 @@ for such programs. + OTHER INFORMATION + ----------------- + +-The developers of this package can be reached through github. +-(see https://github.com/groeck/lm-sensors). Do not hesitate to contact +-us if you have questions, suggestions, problems, want to contribute, +-or just want to report it works for you. But please try to ++The lm_sensors website can be found at ++https://hwmon.wiki.kernel.org/lm_sensors ++ ++The developers of this package can be reached using ++* a mailing list lm-sensors vger kernel org ++ (you can get information on how to subscribe, unsubscribe, and the list ++ of archives at http://vger.kernel.org/vger-lists.html#lm-sensors; ++ you do not need to be subscribed to post to the list) ++* GitHub (see https://github.com/lm-sensors/lm-sensors) ++ ++Do not hesitate to contact us if you have questions, suggestions, problems, ++want to contribute, or just want to report it works for you. But please try to + read the documentation before you ask any questions! It's all under doc/. + + The latest version of this package can always be found at: +-https://github.com/groeck/lm-sensors. ++https://github.com/lm-sensors/lm-sensors. + + LICENSE + ------- +diff --git a/configs/Asus/P3-PH4C.conf b/configs/Asus/P3-PH4C.conf +index 00e5dab8..28b32578 100644 +--- a/configs/Asus/P3-PH4C.conf ++++ b/configs/Asus/P3-PH4C.conf +@@ -5,7 +5,8 @@ chip "w83627ehf-*" "w83627dhg-*" + label in0 "VCore" + label in1 "+12V" + label in2 "AVCC" +-# ACPI says nothing about AVCC, so you might want to uncomment: ++# ACPI says nothing ++# about AVCC, so you might want to uncomment: + #ignore in2 + label in3 "+3.3V" + ignore in4 +diff --git a/configs/Asus/P5B-E.conf b/configs/Asus/P5B-E.conf +index bf62b6e9..5aa506c7 100644 +--- a/configs/Asus/P5B-E.conf ++++ b/configs/Asus/P5B-E.conf +@@ -2,7 +2,7 @@ + + + # This is the sensors.conf configuration file for ASUS P5B-E (and maybe it's different versions) +-# Everythings based on the guide at http://www.lm-sensors.org/wiki/AsusFormulaHacking. The formulas ++# Everythings based on the guide at https://hwmon.wiki.kernel.org/asusformulahacking. The formulas + # and ranges are based on the /proc/acpi/dsdt readings of a P5B-E board with a E6600 CPU. + + chip "w83627dhg-*" +diff --git a/configs/Asus/P5N32-E_SLI_Plus.conf b/configs/Asus/P5N32-E_SLI_Plus.conf +index 8632e099..31ced1e4 100644 +--- a/configs/Asus/P5N32-E_SLI_Plus.conf ++++ b/configs/Asus/P5N32-E_SLI_Plus.conf +@@ -3,7 +3,7 @@ + + # Linux sensor configuration for an Asus P5N32-E SLI Plus + # 5/2007 s.urbanovski#ac-nancy-metz.fr +-# (see http://www.lm-sensors.org/wiki/AsusFormulaHacking) ++# (see https://hwmon.wiki.kernel.org/asusformulahacking) + + chip "w83791d-*" + +diff --git a/configs/Biostar/N68S+.conf b/configs/Biostar/N68S+.conf +index be340df4..ddace3ce 100644 +--- a/configs/Biostar/N68S+.conf ++++ b/configs/Biostar/N68S+.conf +@@ -8,7 +8,7 @@ + # This custom configuration file should be copied to /etc/sensors.d/Biostar-N68S+.conf. + # + # Custom configuration files for some specific mainboards can be found at +-# http://www.lm-sensors.org/wiki/Configurations ++# https://github.com/lm-sensors/lm-sensors/tree/master/configs + + # READ THE MAN PAGE DOCUMENTATION OF 'sensors.conf' FOR MORE + # COMPLETE INFORMATION. ie: +diff --git a/configs/Gigabyte/Z38MX-UD2H-B3.conf b/configs/Gigabyte/Z38MX-UD2H-B3.conf +index 53a23764..5f8d36c5 100644 +--- a/configs/Gigabyte/Z38MX-UD2H-B3.conf ++++ b/configs/Gigabyte/Z38MX-UD2H-B3.conf +@@ -10,7 +10,7 @@ + # from the lm-sensors mailinglist. + + # Questions, comments or additions? Please share on the lm-sensors mailinglist. +-# More info at http://www.lm-sensors.org/wiki/FeedbackAndSupport ++# More info at https://hwmon.wiki.kernel.org/feedbackandsupport + + # Hint: Use sensors -u to list all variables. + http://lists.lm-sensors.org/pipermail/lm-sensors/2014-January/040952.html +diff --git a/doc/developers/lm_sensors.lsm b/doc/developers/lm_sensors.lsm +index fd9495a4..cf239557 100644 +--- a/doc/developers/lm_sensors.lsm ++++ b/doc/developers/lm_sensors.lsm +@@ -6,13 +6,11 @@ Description: Hardware health monitoring package for Linux. It consists of + a library to allow applications to read sensors data more + easily, and of an example program to pretty print this data. + Also included is a fan speed control script. +- http://www.lm-sensors.org/ ++ https://hwmon.wiki.kernel.org/lm_sensors + Keywords: sensors health hardware-monitoring fan-speed + Author: jdelvare@suse.de (Jean Delvare) +-Maintained-by: jdelvare@suse.de (Jean Delvare) +-Primary-site: http://dl.lm-sensors.org/lm-sensors/releases/ +- lm_sensors-3.4.0.tar.bz2 +- lm_sensors-3.4.0.tar.bz2.sig +-Alternate-site: ftp://ftp.netroedge.com/pub/lm-sensors/ ++Maintained-by: olysonek@redhat.com (Ondřej Lysoněk) ++Primary-site: https://github.com ++ /lm-sensors/lm-sensors/archive/V3-4-0/lm-sensors-3-4-0.tar.gz + Copying-policy: GPL/LGPL + End +diff --git a/doc/developers/release_checklist b/doc/developers/release_checklist +index 9ea1ddf2..b84256b5 100644 +--- a/doc/developers/release_checklist ++++ b/doc/developers/release_checklist +@@ -12,30 +12,16 @@ Release steps: + - Update doc/libsensors-API.txt and SENSORS_API_VERSION in lib/sensors.h + - Update version.h + - Commit +-- Tag the release using SVN: +- svn copy http://lm-sensors.org/svn/lm-sensors/trunk http://lm-sensors.org/svn/lm-sensors/tags/V3-x-x -m "3.x.x release" +- +-- Move to a temporary directory and get a copy of the freshly tagged code: +- svn export http://lm-sensors.org/svn/lm-sensors/tags/V3-x-x lm_sensors-3.x.x +-- Tar it up: +- tar -jcf lm_sensors-3.x.x.tar.bz2 lm_sensors-3.x.x +-- Sign it: +- gpg -b lm_sensors-3.x.x.tar.bz2 +-- Post it: +- scp lm_sensors-3.x.x.tar.bz2{,.sig} devel.atrpms.net:/srv/lm-sensors.org/dl/lm-sensors/releases +-- Set correct permissions: +- ssh devel.atrpms.net chmod 664 '/srv/lm-sensors.org/dl/lm-sensors/releases/lm_sensors-3.x.x.tar.bz2{,.sig}' ++- Tag the release using git: ++ git tag V3-x-x ++ git push origin V3-x-x + + After release, remember to: +-- Update the Download page on lm-sensors.org, then add a news item ++- Update the Download page on https://hwmon.wiki.kernel.org/download - use ++ a URL in the following format: ++ https://github.com/lm-sensors/lm-sensors/archive/V3-x-x/lm-sensors-3-x-x.tar.gz ++- Add a news item to https://hwmon.wiki.kernel.org/lm_sensors + - Announce on the lm-sensors mailing list +-- Add "+SVN" to version.h and commit +-- Mark the corresponding release milestone as complete using trac-admin +- e.g. 'trac-admin /srv/lm-sensors.org/trac milestone completed 3.x.x now' +-- Create a new version for the bug tracking system using trac-admin +- e.g. 'trac-admin /srv/lm-sensors.org/trac version add 3.x.x now' +-- Create a new release milestone using trac-admin +- e.g. 'trac-admin /srv/lm-sensors.org/trac milestone add 3.x.x+1 2012-05-10' ++- Add "+git" to version.h and commit + - Send lm_sensors.lsm to the LSM by mailing it to lsm@qqx.org with the + subject `add' (no quotes) +-- Copy to mirrors +diff --git a/doc/donations b/doc/donations +index 92eea578..4a30c2d0 100644 +--- a/doc/donations ++++ b/doc/donations +@@ -12,7 +12,7 @@ so hardware which isn't directly related to the development of a hardware + monitoring driver, but can be used to build test systems, is welcome too. + + If you would like to make a donation, please contact us. See +-http://www.lm-sensors.org/wiki/AuthorsAndContributors. Thanks! ++https://hwmon.wiki.kernel.org/authorsandcontributors. Thanks! + + + Donations are listed in chronological order. Note that the person mentioned +diff --git a/doc/git b/doc/git +index 1c433d2f..beeaedd8 100644 +--- a/doc/git ++++ b/doc/git +@@ -9,7 +9,7 @@ using git. The git repository is only used for user-space tools. + We presume that you have git installed on your machine. To check out a + working copy of the code for this project use the following command: + +-git clone https://github.com/groeck/lm-sensors.git ++git clone https://github.com/lm-sensors/lm-sensors.git + + To update the code, do a git pull from within the lm-sensors directory. + Please read the README and INSTALL files of your working copy for how +diff --git a/doc/progs b/doc/progs +index e9e997ac..0c5464df 100644 +--- a/doc/progs ++++ b/doc/progs +@@ -6,7 +6,7 @@ These programs are generally small utilities used for debugging, + and installation of the lm_sensors package, and for demonstrating + the use of the drivers and libraries in this package. + For more elaborate programs (for example, GUI sensor displays), +-see https://github.com/groeck/lm-sensors/ ++see https://github.com/lm-sensors/lm-sensors/ + http://sensors-applet.sourceforge.net/ + https://01.org/powertop/ + https://wpitchoune.net/psensor/ +diff --git a/etc/sensors.conf.eg b/etc/sensors.conf.eg +index 1bd39356..15bc26f0 100644 +--- a/etc/sensors.conf.eg ++++ b/etc/sensors.conf.eg +@@ -2003,7 +2003,7 @@ chip "f71805f-*" "f71872f-*" + # The configuration below is for the Kv8Pro and AV8 this is the default as this + # driver is developed and tested on a Kv8Pro. + # Configurations for many other Abit boards can be found at: +-# http://www.lm-sensors.org/trac/wiki/Configurations/Abit ++# https://github.com/lm-sensors/lm-sensors/tree/master/configs/Abit + # If your motherboard isn't listed there and you create a configuration for it + # please add it there. + +@@ -2111,7 +2111,7 @@ chip "dme1737-*" + # driver is developed and tested on an Epox EP-9U1697 GLI board. + # + # Premade configurations for other boards can be found at: +-# http://www.lm-sensors.org/trac/wiki/Configurations/ ++# https://github.com/lm-sensors/lm-sensors/tree/master/configs + # If your motherboard isn't listed there and you create a configuration for it + # please add it there. + # +diff --git a/lib/libsensors.3 b/lib/libsensors.3 +index bfb67c47..995c8305 100644 +--- a/lib/libsensors.3 ++++ b/lib/libsensors.3 +@@ -286,5 +286,4 @@ sensors.conf(5) + + .SH AUTHOR + Frodo Looijaard, Jean Delvare and others +-http://www.lm-sensors.org/ +- ++https://hwmon.wiki.kernel.org/lm_sensors +diff --git a/lib/sensors.conf.5 b/lib/sensors.conf.5 +index d8695239..843a2113 100644 +--- a/lib/sensors.conf.5 ++++ b/lib/sensors.conf.5 +@@ -567,7 +567,4 @@ libsensors(3) + + .SH AUTHOR + Frodo Looijaard and the lm_sensors group +-http://www.lm-sensors.org/ +- +- +- ++https://hwmon.wiki.kernel.org/lm_sensors +diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect +index b1b4b20b..0b3b0ff2 100755 +--- a/prog/detect/sensors-detect ++++ b/prog/detect/sensors-detect +@@ -7285,7 +7285,7 @@ sub generate_modprobes + next if not @{$chips_detected{$driver}}; + if ($driver eq "to-be-written") { + print "Note: there is no driver for ${$chips_detected{$driver}}[0]{chipname} yet.\n". +- "Check http://www.lm-sensors.org/wiki/Devices for updates.\n\n"; ++ "Check https://hwmon.wiki.kernel.org/device_support_status for updates.\n\n"; + } elsif (!is_module_builtin($driver)) { + open(local *INPUTFILE, "modprobe -l $driver 2>/dev/null |"); + local $_; +@@ -7301,7 +7301,7 @@ sub generate_modprobes + # isn't supported + if ((($? >> 8) == 0) && ! $modulefound) { + print "Warning: the required module $driver is not currently installed\n". +- "on your system. Check http://www.lm-sensors.org/wiki/Devices for\n". ++ "on your system. Check https://hwmon.wiki.kernel.org/device_support_status for\n". + "driver availability.\n\n"; + } else { + $hwmon_modules{$driver}++ +@@ -7591,7 +7591,7 @@ sub main + print "Either your system has no sensors, or they are not supported, or\n". + "they are connected to an I2C or SMBus adapter that is not\n". + "supported. If you find out what chips are on your board, check\n". +- "http://www.lm-sensors.org/wiki/Devices for driver status.\n"; ++ "https://hwmon.wiki.kernel.org/device_support_status for driver status.\n"; + } + exit; + } +diff --git a/prog/dump/isadump.8 b/prog/dump/isadump.8 +index 6bf5ea4a..1fa09fd0 100644 +--- a/prog/dump/isadump.8 ++++ b/prog/dump/isadump.8 +@@ -107,7 +107,7 @@ i2cdump(8), isaset(8) + + .SH AUTHOR + Frodo Looijaard, Mark D. Studebaker, and the lm_sensors group +-(http://www.lm-sensors.org/) ++(https://hwmon.wiki.kernel.org/lm_sensors) + .PP + This manual page was originally written by David Z Maze for + the Debian GNU/Linux system. It was then reviewed and augmented by the lm_sensors +diff --git a/prog/dump/isaset.8 b/prog/dump/isaset.8 +index e7bcd5db..4051af9e 100644 +--- a/prog/dump/isaset.8 ++++ b/prog/dump/isaset.8 +@@ -77,7 +77,7 @@ i2cset(8), isadump(8) + + .SH AUTHOR + Mark D. Studebaker, and the lm_sensors group +-(http://www.lm-sensors.org/) ++(https://hwmon.wiki.kernel.org/lm_sensors) + .PP + This manual page was shamelessly ripped from the i2cset and isadump manual + pages by Jean Delvare. +diff --git a/prog/init/lm_sensors.init b/prog/init/lm_sensors.init +index 77172d24..2ad58abc 100755 +--- a/prog/init/lm_sensors.init ++++ b/prog/init/lm_sensors.init +@@ -20,7 +20,7 @@ + # MA 02110-1301 USA. + + # See also the lm_sensors homepage at: +-# http://www.lm-sensors.org ++# https://hwmon.wiki.kernel.org/lm_sensors + + # It uses a config file /etc/sysconfig/lm_sensors that contains the modules + # to be loaded/unloaded. That file is sourced into this one. +diff --git a/prog/rrd/sens_day.in b/prog/rrd/sens_day.in +index 75dc13bd..15412f2b 100644 +--- a/prog/rrd/sens_day.in ++++ b/prog/rrd/sens_day.in +@@ -217,7 +217,7 @@ See also:
+

+ + This page generated with data and scripts from +-the lm_sensors project; ++the lm_sensors project; + the data are stored in a Round Robin Database and + the graphs are generated by + +diff --git a/prog/rrd/sens_week.in b/prog/rrd/sens_week.in +index cce50555..2b92f655 100644 +--- a/prog/rrd/sens_week.in ++++ b/prog/rrd/sens_week.in +@@ -217,7 +217,7 @@ See also:
+

+ + This page generated with data and scripts from +-the lm_sensors project; ++the lm_sensors project; + the data are stored in a Round Robin Database and + the graphs are generated by + +diff --git a/prog/rrd/summ_week.in b/prog/rrd/summ_week.in +index 713197dc..7051d5f0 100644 +--- a/prog/rrd/summ_week.in ++++ b/prog/rrd/summ_week.in +@@ -89,7 +89,7 @@ See also:
+

+ + This page generated with data and scripts from +-the lm_sensors project; ++the lm_sensors project; + the data are stored in a Round Robin Database and + the graphs are generated by + +diff --git a/prog/sensord/rrd.c b/prog/sensord/rrd.c +index 3cde7f18..a531362b 100644 +--- a/prog/sensord/rrd.c ++++ b/prog/sensord/rrd.c +@@ -498,7 +498,8 @@ int rrdCGI(void) + printf("

\nsensord by " + "Merlin Hughes" + ", all credit to the " +- "lm_sensors " ++ "" ++ "lm_sensors " + "crew.\n

\n"); + + printf("\n\n"); +diff --git a/prog/sensors/sensors.1 b/prog/sensors/sensors.1 +index ea0e238e..7d66e4b3 100644 +--- a/prog/sensors/sensors.1 ++++ b/prog/sensors/sensors.1 +@@ -93,6 +93,6 @@ sensors.conf(5), sensors-detect(8). + + .SH AUTHOR + Frodo Looijaard and the lm_sensors group +-http://www.lm-sensors.org/ ++https://hwmon.wiki.kernel.org/lm_sensors + + +diff --git a/prog/tellerstats/index.shtml b/prog/tellerstats/index.shtml +index 60c8ca14..1b71376e 100644 +--- a/prog/tellerstats/index.shtml ++++ b/prog/tellerstats/index.shtml +@@ -40,7 +40,7 @@ These plots were generated +

+ + This page generated with drivers and the tellerstats scripts from +-The lm_sensors drivers. ++The lm_sensors drivers. + +

+ +diff --git a/version.h b/version.h +index ad74e71b..bbdc04d9 100644 +--- a/version.h ++++ b/version.h +@@ -1 +1 @@ +-#define LM_VERSION "3.4.0+SVN" ++#define LM_VERSION "3.4.0+git" +-- +2.20.1 + diff --git a/0001-sensors-detect-Add-detection-of-AMD-Family-17h-model.patch b/0001-sensors-detect-Add-detection-of-AMD-Family-17h-model.patch new file mode 100644 index 0000000..8b1d318 --- /dev/null +++ b/0001-sensors-detect-Add-detection-of-AMD-Family-17h-model.patch @@ -0,0 +1,31 @@ +From 782a2124b60837c981b61c2f6a5d4501d4e0f964 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= +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 +--- + 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.20.1 + diff --git a/0001-sensors-detect-Add-support-for-AMD-CPU-Family-19h.patch b/0001-sensors-detect-Add-support-for-AMD-CPU-Family-19h.patch new file mode 100644 index 0000000..dea46fa --- /dev/null +++ b/0001-sensors-detect-Add-support-for-AMD-CPU-Family-19h.patch @@ -0,0 +1,26 @@ +From 0ed0dcd43556598c657dc527e3a8e5c04621e64b Mon Sep 17 00:00:00 2001 +From: a b +Date: Thu, 29 Oct 2020 17:25:38 +0100 +Subject: [PATCH] Add support for AMD CPU Family 19h + +--- + prog/detect/sensors-detect | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect +index 8ee1c1b..3bcb547 100755 +--- a/prog/detect/sensors-detect ++++ b/prog/detect/sensors-detect +@@ -2779,6 +2779,10 @@ use vars qw(@cpu_ids); + name => "AMD Family 16h power sensors", + driver => "fam15h_power", + detect => sub { amd_pci_detect('1534') }, ++ }, { ++ name => "AMD Family 19h thermal sensors", ++ driver => "k10temp", ++ detect => sub { amd_pci_detect('1653') }, + }, { + name => "Intel digital thermal sensor", + driver => "coretemp", +-- +2.26.2 diff --git a/0001-sensors-detect-Fix-printing-CPU-info-on-ppc-and-arm.patch b/0001-sensors-detect-Fix-printing-CPU-info-on-ppc-and-arm.patch new file mode 100644 index 0000000..f3a5850 --- /dev/null +++ b/0001-sensors-detect-Fix-printing-CPU-info-on-ppc-and-arm.patch @@ -0,0 +1,54 @@ +From c28d20d19d620f42d239ed4b35139683035f11dc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= +Date: Thu, 17 Oct 2019 10:07:21 +0200 +Subject: [PATCH] sensors-detect: Fix printing CPU info on ppc and arm + +The format of /proc/cpuinfo on other arches is different from the +format on x86. Modify the print_cpu_info function to handle arm and +ppc. + +This change also eliminates Perl warnings caused by non-existent +elements in the %cpu hash: +Use of uninitialized value in concatenation (.) or string at +./prog/detect/sensors-detect line 3124. + +Based on a patch from Changqing Li , +GitHub PR: https://github.com/lm-sensors/lm-sensors/pull/168 +--- + prog/detect/sensors-detect | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect +index c2cbe9b9..78b0b5a1 100755 +--- a/prog/detect/sensors-detect ++++ b/prog/detect/sensors-detect +@@ -3130,7 +3130,7 @@ sub initialize_cpu_list + }; + next; + } +- if (m/^(vendor_id|cpu family|model|model name|stepping|cpuid level)\s*:\s*(.+)$/) { ++ if (m/^(vendor_id|cpu family|model|model name|stepping|cpuid level|cpu|revision)\s*:\s*(.+)$/) { + my $k = $1; + my $v = $2; + $v =~ s/\s+/ /g; # Merge multiple spaces +@@ -3146,7 +3146,16 @@ sub initialize_cpu_list + sub print_cpu_info + { + my $cpu = $cpu[0]; +- print "# Processor: $cpu->{'model name'} ($cpu->{'cpu family'}/$cpu->{model}/$cpu->{stepping})\n"; ++ if ($kernel_arch =~ m/^ppc(64(le)?)?$/) { ++ print "# Processor: $cpu->{cpu} ($cpu->{revision})\n"; ++ } elsif ($kernel_arch =~ m/^arm/) { ++ print "# Processor: $cpu->{'model name'}\n"; ++ } elsif (exists $cpu->{'model name'} && exists $cpu->{'cpu family'} ++ && exists $cpu->{'model'} && exists $cpu->{'stepping'}) { ++ print "# Processor: $cpu->{'model name'} ($cpu->{'cpu family'}/$cpu->{model}/$cpu->{stepping})\n"; ++ } else { ++ print "# Cannot show processor info on $kernel_arch architecture.\n"; ++ } + } + + # @i2c_adapters is a list of references to hashes, one hash per I2C/SMBus +-- +2.20.1 + diff --git a/EMPTY b/EMPTY deleted file mode 100644 index 0519ecb..0000000 --- a/EMPTY +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/fix-unexpanded-revision-strings.patch b/fix-unexpanded-revision-strings.patch new file mode 100644 index 0000000..ec07c3e --- /dev/null +++ b/fix-unexpanded-revision-strings.patch @@ -0,0 +1,85 @@ +diff --git a/doc/developers/release_checklist b/doc/developers/release_checklist +index b84256b5..a97745e1 100644 +--- a/doc/developers/release_checklist ++++ b/doc/developers/release_checklist +@@ -10,7 +10,7 @@ Release steps: + - Update the CHANGES file (set version and release date) + - Update doc/developers/lm_sensors.lsm (Version, Entered-date and Primary-site) + - Update doc/libsensors-API.txt and SENSORS_API_VERSION in lib/sensors.h +-- Update version.h ++- grep for LM_VERSION and update values of the constants + - Commit + - Tag the release using git: + git tag V3-x-x +@@ -22,6 +22,7 @@ After release, remember to: + https://github.com/lm-sensors/lm-sensors/archive/V3-x-x/lm-sensors-3-x-x.tar.gz + - Add a news item to https://hwmon.wiki.kernel.org/lm_sensors + - Announce on the lm-sensors mailing list +-- Add "+git" to version.h and commit ++- grep for LM_VERSION and add "+git" to the values of the constants ++- Commit + - Send lm_sensors.lsm to the LSM by mailing it to lsm@qqx.org with the + subject `add' (no quotes) +diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect +index 78b0b5a1..07df0fbe 100755 +--- a/prog/detect/sensors-detect ++++ b/prog/detect/sensors-detect +@@ -38,12 +38,9 @@ foreach ('/usr/sbin', '/usr/local/sbin', '/sbin') { + ######################### + + use constant NO_CACHE => 1; ++use constant LM_VERSION => '3.4.0+git'; + use vars qw(@pci_adapters @chip_ids @ipmi_ifs @non_hwmon_chip_ids +- $i2c_addresses_to_scan $revision @i2c_byte_cache %opt); +- +-$revision = '$Revision$ ($Date$)'; +-$revision =~ s/\$\w+: (.*?) \$/$1/g; +-$revision =~ s/ \([^()]*\)//; ++ $i2c_addresses_to_scan @i2c_byte_cache %opt); + + # This is the list of SMBus or I2C adapters we recognize by their PCI + # signature. This is an easy and fast way to determine which SMBus or I2C +@@ -7511,7 +7508,7 @@ sub main + system("/sbin/service", "lm_sensors", "stop"); + } + +- print "# sensors-detect revision $revision\n"; ++ print "# sensors-detect version ".LM_VERSION."\n"; + initialize_dmi_data(); + print_dmi_summary(); + print_kernel_version(); +diff --git a/prog/init/fancontrol.init b/prog/init/fancontrol.init +index eabe734c..8ab2c929 100755 +--- a/prog/init/fancontrol.init ++++ b/prog/init/fancontrol.init +@@ -1,7 +1,5 @@ + #!/bin/sh + # +-# $Id$ +-# + # fancontrol + # + # chkconfig: 2345 90 01 +diff --git a/prog/pwm/pwmconfig b/prog/pwm/pwmconfig +index a40acd5c..3ecdca5b 100755 +--- a/prog/pwm/pwmconfig ++++ b/prog/pwm/pwmconfig +@@ -29,8 +29,7 @@ + # + # + +-REVISION=$(echo '$Revision$' | cut -d' ' -f2) +-REVDATE=$(echo '$Date$' | cut -d' ' -f2) ++LM_VERSION='3.4.0+git' + PIDFILE="/var/run/fancontrol.pid" + + if [ -f "$PIDFILE" ] +@@ -48,7 +47,7 @@ then + exit 1 + fi + +-echo "# pwmconfig revision $REVISION ($REVDATE)" ++echo "# pwmconfig version $LM_VERSION" + echo 'This program will search your sensors for pulse width modulation (pwm)' + echo 'controls, and test each one to see if it controls a fan on' + echo 'your motherboard. Note that many motherboards do not have pwm' diff --git a/lm_sensors-3.4.0-allow_no_sensors.patch b/lm_sensors-3.4.0-allow_no_sensors.patch new file mode 100644 index 0000000..17d85f0 --- /dev/null +++ b/lm_sensors-3.4.0-allow_no_sensors.patch @@ -0,0 +1,92 @@ +diff --git a/prog/sensors/main.c b/prog/sensors/main.c +index f535b66..a19b919 100644 +--- a/prog/sensors/main.c ++++ b/prog/sensors/main.c +@@ -54,15 +54,16 @@ static void print_short_help(void) + static void print_long_help(void) + { + printf("Usage: %s [OPTION]... [CHIP]...\n", PROGRAM); +- puts(" -c, --config-file Specify a config file\n" +- " -h, --help Display this help text\n" +- " -s, --set Execute `set' statements (root only)\n" +- " -f, --fahrenheit Show temperatures in degrees fahrenheit\n" +- " -A, --no-adapter Do not show adapter for each chip\n" +- " --bus-list Generate bus statements for sensors.conf\n" +- " -u Raw output\n" +- " -j Json output\n" +- " -v, --version Display the program version\n" ++ puts(" -c, --config-file Specify a config file\n" ++ " -h, --help Display this help text\n" ++ " -s, --set Execute `set' statements (root only)\n" ++ " -f, --fahrenheit Show temperatures in degrees fahrenheit\n" ++ " -A, --no-adapter Do not show adapter for each chip\n" ++ " --bus-list Generate bus statements for sensors.conf\n" ++ " -u Raw output\n" ++ " -j Json output\n" ++ " -v, --version Display the program version\n" ++ " -n, --allow-no-sensors Do not fail if no sensors found\n" + "\n" + "Use `-' after `-c' to read the config file from stdin.\n" + "If no chips are specified, all chip info will be printed.\n" +@@ -270,7 +271,7 @@ static void print_bus_list(void) + + int main(int argc, char *argv[]) + { +- int c, i, err, do_bus_list; ++ int c, i, err, do_bus_list, allow_no_sensors; + const char *config_file_name = NULL; + + struct option long_opts[] = { +@@ -281,6 +282,7 @@ int main(int argc, char *argv[]) + { "no-adapter", no_argument, NULL, 'A' }, + { "config-file", required_argument, NULL, 'c' }, + { "bus-list", no_argument, NULL, 'B' }, ++ { "allow-no-sensors", no_argument, NULL, 'n' }, + { 0, 0, 0, 0 } + }; + +@@ -291,8 +293,9 @@ int main(int argc, char *argv[]) + do_sets = 0; + do_bus_list = 0; + hide_adapter = 0; ++ allow_no_sensors = 0; + while (1) { +- c = getopt_long(argc, argv, "hsvfAc:uj", long_opts, NULL); ++ c = getopt_long(argc, argv, "hsvfAc:ujn", long_opts, NULL); + if (c == EOF) + break; + switch(c) { +@@ -327,6 +330,9 @@ int main(int argc, char *argv[]) + case 'B': + do_bus_list = 1; + break; ++ case 'n': ++ allow_no_sensors = 1; ++ break; + default: + fprintf(stderr, + "Internal error while parsing options!\n"); +@@ -349,7 +355,9 @@ int main(int argc, char *argv[]) + "No sensors found!\n" + "Make sure you loaded all the kernel drivers you need.\n" + "Try sensors-detect to find out which these are.\n"); +- err = 1; ++ if (!allow_no_sensors) { ++ err = 1; ++ } + } + } else { + int cnt = 0; +diff --git a/prog/sensors/sensors.1 b/prog/sensors/sensors.1 +index 7d66e4b..d207aa1 100644 +--- a/prog/sensors/sensors.1 ++++ b/prog/sensors/sensors.1 +@@ -78,6 +78,8 @@ are only needed if you have several chips sharing the same address on different + buses of the same type. As bus numbers are usually not guaranteed to be stable + over reboots, these statements let you refer to each bus by its name rather + than numbers. ++.IP "-n, --allow-no-sensors" ++Do not fail if no sensors found. The error message will be printed in the log. + .SH FILES + .I /etc/sensors3.conf + .br diff --git a/lm_sensors-modprobe-r-wrapper b/lm_sensors-modprobe-r-wrapper new file mode 100755 index 0000000..3f8ad7e --- /dev/null +++ b/lm_sensors-modprobe-r-wrapper @@ -0,0 +1,8 @@ +#!/bin/sh +if [ $# -ne 0 ]; then + /usr/sbin/modprobe -abr "$@" +else + echo "No sensors with loadable kernel modules configured." + echo "Please, run 'sensors-detect' as root in order to search for available sensors." + exit 1 +fi diff --git a/lm_sensors-modprobe-wrapper b/lm_sensors-modprobe-wrapper new file mode 100755 index 0000000..a1d5e8b --- /dev/null +++ b/lm_sensors-modprobe-wrapper @@ -0,0 +1,8 @@ +#!/bin/sh +if [ $# -ne 0 ]; then + /usr/sbin/modprobe -ab "$@" +else + echo "No sensors with loadable kernel modules configured." + echo "Please, run 'sensors-detect' as root in order to search for available sensors." + exit 1 +fi diff --git a/lm_sensors-wrapper b/lm_sensors-wrapper new file mode 100644 index 0000000..8eb32a4 --- /dev/null +++ b/lm_sensors-wrapper @@ -0,0 +1,8 @@ +#!/bin/sh +if /usr/bin/systemd-detect-virt 2>/dev/null 1>&2; then + SENSORS_FLAGS_VM='-n'; +else + SENSORS_FLAGS_VM=''; +fi; + +/usr/bin/sensors -s $SENSORS_FLAGS_VM diff --git a/lm_sensors.service b/lm_sensors.service new file mode 100644 index 0000000..fc99241 --- /dev/null +++ b/lm_sensors.service @@ -0,0 +1,13 @@ +[Unit] +Description=Hardware Monitoring Sensors + +[Service] +EnvironmentFile=/etc/sysconfig/lm_sensors +Type=oneshot +RemainAfterExit=yes +ExecStart=-@WRAPPER_DIR@/lm_sensors-modprobe-wrapper $BUS_MODULES $HWMON_MODULES +ExecStart=@WRAPPER_DIR@/lm_sensors-wrapper +ExecStop=-@WRAPPER_DIR@/lm_sensors-modprobe-r-wrapper $BUS_MODULES $HWMON_MODULES + +[Install] +WantedBy=multi-user.target diff --git a/lm_sensors.spec b/lm_sensors.spec new file mode 100644 index 0000000..b4523c3 --- /dev/null +++ b/lm_sensors.spec @@ -0,0 +1,735 @@ +%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: 23.%{date}git%{shortcommit}%{?dist} +Summary: Hardware monitoring tools +Group: Applications/System + +# Some man pages are licensed Verbatim (lib/sensors.conf.5, +# prog/sensors/sensors.1). Files from dist-git are licensed +# MIT (according to the Fedora Project Contributor Agreement +# https://fedoraproject.org/wiki/Licensing:Main#License_of_Fedora_SPEC_Files). +# The rest is GPLv2+. +License: GPLv2+ and Verbatim and MIT + +URL: http://github.com/lm-sensors/lm-sensors/ + +Source0: http://github.com/lm-sensors/lm-sensors/archive/%{commit}/lm-sensors-%{commit}.tar.gz +Source1: lm_sensors.sysconfig +# This one was taken from PLD-linux, Thanks! +Source2: sensord.sysconfig +Source3: lm_sensors-modprobe-wrapper +Source4: lm_sensors-modprobe-r-wrapper +Source5: sensord.service +Source6: sensord-service-wrapper +Source7: lm_sensors.service +Source8: lm_sensors-wrapper + +# Upstream patch: +Patch1: 0001-sensors-detect-Add-detection-of-AMD-Family-17h-model.patch +# Patch that combines several upstream patches: +Patch2: 0001-Fix-stale-links-and-outdated-info.patch +# Upstream commit c28d20d19d620f42d: +Patch3: 0001-sensors-detect-Fix-printing-CPU-info-on-ppc-and-arm.patch +# Patch that combines upstream commits 5c900c7e851cc and f1e1a7607caa96b, +# with the version string modified from 3.5.0+git to 3.4.0+git. Drop/modify +# this patch on rebase. +Patch4: fix-unexpanded-revision-strings.patch +# Upstream commit 5deee7d0c301df779: +Patch5: 0001-sensors-detect-Add-support-for-AMD-CPU-Family-19h.patch +# Upstream commit a0ef84f6583dbf427ff5a3534528e1e72bd00137: +Patch6: lm_sensors-3.4.0-allow_no_sensors.patch + +Requires: /usr/sbin/modprobe +%ifarch %{ix86} x86_64 +Requires: /usr/sbin/dmidecode +%endif +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires(post): systemd-units +BuildRequires: kernel-headers >= 2.2.16, bison, libsysfs-devel, flex, gawk +BuildRequires: perl-generators +BuildRequires: rrdtool-devel +BuildRequires: gcc + + +%description +The lm_sensors package includes a collection of modules for general SMBus +access and hardware monitoring. + + +%package libs +Summary: Lm_sensors core libraries +Group: System Environment/Libraries +License: LGPLv2+ + +%description libs +Core libraries for lm_sensors applications + + +%package devel +Summary: Development files for programs which will use lm_sensors +Group: Development/System +Requires: %{name}-libs = %{version}-%{release} +# One manual page is licensed Verbatim (lib/libsensors.3). The rest is LGPLv2+. +License: LGPLv2+ and Verbatim + +%description devel +The lm_sensors-devel package includes a header files and libraries for use +when building applications that make use of sensor data. + + +%package sensord +Summary: Daemon that periodically logs sensor readings +Group: System Environment/Daemons +Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +# One man page is licensed Verbatim (prog/sensord/sensord.8). Files from +# dist-git are licensed MIT according to the FPCA. The rest is GPLv2+. +License: GPLv2+ and Verbatim and MIT + +%description sensord +Daemon that periodically logs sensor readings to syslog or a round-robin +database, and warns of sensor alarms. + + +%prep +%setup -q -n lm-sensors-%{commit} +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -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 + +mv prog/init/README prog/init/README.initscripts +chmod -x prog/init/fancontrol.init + +# fixing the sensord-service-wrapper path +cp -p %{SOURCE5} sensord.service +cp -p %{SOURCE7} lm_sensors.service +sed -i "s|\@WRAPPER_DIR\@|%{_libexecdir}/%{name}|" sensord.service +sed -i "s|\@WRAPPER_DIR\@|%{_libexecdir}/%{name}|" lm_sensors.service + + +%build +%set_build_flags +make PREFIX=%{_prefix} LIBDIR=%{_libdir} MANDIR=%{_mandir} \ + EXLDFLAGS="$LDFLAGS" PROG_EXTRA=sensord BUILD_STATIC_LIB=0 user + + +%install +make PREFIX=%{_prefix} LIBDIR=%{_libdir} MANDIR=%{_mandir} PROG_EXTRA=sensord \ + DESTDIR=$RPM_BUILD_ROOT BUILD_STATIC_LIB=0 user_install + +ln -s sensors.conf.5.gz $RPM_BUILD_ROOT%{_mandir}/man5/sensors3.conf.5.gz + +mkdir -p $RPM_BUILD_ROOT%{_initrddir} +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sensors.d +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig +install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/lm_sensors +install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sensord + +# service files +mkdir -p $RPM_BUILD_ROOT%{_unitdir} +install -pm 644 prog/init/fancontrol.service $RPM_BUILD_ROOT%{_unitdir} +install -pm 644 lm_sensors.service $RPM_BUILD_ROOT%{_unitdir} +install -pm 644 sensord.service $RPM_BUILD_ROOT%{_unitdir} + +# customized modprobe calls +mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name} +install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_libexecdir}/%{name}/lm_sensors-modprobe-wrapper +install -pm 755 %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/%{name}/lm_sensors-modprobe-r-wrapper +install -pm 755 %{SOURCE8} $RPM_BUILD_ROOT%{_libexecdir}/%{name}/lm_sensors-wrapper + +# sensord service wrapper +install -pm 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libexecdir}/%{name}/sensord-service-wrapper + + +# Note non standard systemd scriptlets, since reload / stop makes no sense +# for lm_sensors +%triggerun -- lm_sensors < 3.3.0-2 +if [ -L /etc/rc3.d/S26lm_sensors ]; then + /bin/systemctl enable lm_sensors.service >/dev/null 2>&1 || : +fi +/sbin/chkconfig --del lm_sensors + +# ===== main ===== + +%post +%systemd_post lm_sensors.service + +%preun +%systemd_preun lm_sensors.service + +%postun +%systemd_postun_with_restart lm_sensors.service + +# ==== sensord === + +%post sensord +%systemd_post sensord.service + +%preun sensord +%systemd_preun sensord.service + +%postun sensord +%systemd_postun_with_restart sensord.service + +# ===== libs ===== + +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig + + +%files +%license COPYING +%doc CHANGES CONTRIBUTORS doc README* +%doc prog/init/fancontrol.init prog/init/README.initscripts +%config %{_sysconfdir}/sensors3.conf +%config(noreplace) %{_sysconfdir}/sysconfig/lm_sensors +%dir %{_sysconfdir}/sensors.d +%{_bindir}/* +%{_mandir}/man1/* +%{_mandir}/man5/* +%{_mandir}/man8/* +%{_sbindir}/* +%{_unitdir}/lm_sensors.service +%{_unitdir}/fancontrol.service +%dir %{_libexecdir}/%{name} +%{_libexecdir}/%{name}/lm_sensors-modprobe*wrapper +%{_libexecdir}/%{name}/lm_sensors-wrapper +%exclude %{_sbindir}/sensord +%exclude %{_mandir}/man8/sensord.8.gz + +%files libs +%{_libdir}/*.so.* +%license COPYING.LGPL + +%files devel +%{_includedir}/sensors +%{_libdir}/lib*.so +%{_mandir}/man3/* + +%files sensord +%doc prog/sensord/README +%{_sbindir}/sensord +%{_mandir}/man8/sensord.8.gz +%config(noreplace) %{_sysconfdir}/sysconfig/sensord +%{_unitdir}/sensord.service +%{_libexecdir}/%{name}/sensord-service-wrapper + + +%changelog +* Thu Feb 25 2021 Artem Egorenkov - 3.4.0-23 +- New flag for no sensors added. This flag is used in VM environment + to make sensors binaries not fail if no sensors was detected. + +* Fri Oct 30 2020 Artem Egorenkov - 3.4.0-22.20180522git70f7e08 +- Add support for AMD CPU Family 19h +- Resolves: rhbz#1846847 + +* Fri Oct 18 2019 Ondřej Lysoněk - 3.4.0-21.20180522git70f7e08 +- Fix printing CPU info on non-x86 architectures in sensors-detect +- Resolves: rhbz#1752854 +- Fix printing lm_sensors version in sensors-detect and pwmconfig +- Resolves: rhbz#1677414 + +* Mon May 06 2019 Ondřej Lysoněk - 3.4.0-20.20180522git70f7e08 +- Added explicit Requires on lm_sensors-libs +- Resolves: rhbz#1706145 + +* Fri May 03 2019 Ondřej Lysoněk - 3.4.0-19.20180522git70f7e08 +- Fixed stale links and outdated info +- Resolves: rhbz#1693347 + +* Wed Apr 24 2019 Ondřej Lysoněk - 3.4.0-18.20180522git70f7e08 +- Detect AMD Rome - Family 17h model 30h +- Resolves: rhbz#1650191 + +* Tue Jul 17 2018 Ondřej Lysoněk - 3.4.0-17.20180522git70f7e08 +- Corrected the License tag + +* Fri Jul 13 2018 Fedora Release Engineering - 3.4.0-16.20180522git70f7e08 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* 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 +- Covscan fixes + +* Fri Apr 20 2018 Ondřej Lysoněk - 3.4.0-13 +- Detect AMD Family 17h thermal sensors +- Resolves: rhbz#1569542 + +* Thu Apr 12 2018 Ondřej Lysoněk - 3.4.0-12 +- Use LDFLAGS when linking executables +- Resolves: rhbz#1548691 + +* Mon Apr 09 2018 Rafael Santos - 3.4.0-11 +- Use standard Fedora build and linker flags (bug #1548691) + +* Mon Feb 19 2018 Ondřej Lysoněk - 3.4.0-10 +- Add gcc to BuildRequires + +* Thu Feb 08 2018 Fedora Release Engineering - 3.4.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 3.4.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 3.4.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 3.4.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sun May 15 2016 Hans de Goede - 3.4.0-5 +- Rebuilt for new librrd + +* Thu Feb 04 2016 Fedora Release Engineering - 3.4.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Aug 20 2015 Jaromir Capik - 3.4.0-3 +- Removing 'noreplace' for sensors3.conf (#1239216) + +* Tue Aug 04 2015 Jaromir Capik - 3.4.0-2 +- Adding /etc/sensors.d in the %%files (#1236309) + +* Thu Jun 25 2015 Jaromir Capik - 3.4.0-1 +- Updating to 3.4.0 (#1235660) + +* Wed Jun 17 2015 Fedora Release Engineering - 3.3.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Aug 17 2014 Fedora Release Engineering - 3.3.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 3.3.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Jan 25 2014 Ville Skyttä - 3.3.5-3 +- Own the %%{_libexecdir}/lm_sensors dir. +- Fix case of Public Domain in license tag. + +* Fri Jan 24 2014 Jaromir Capik - 3.3.5-2 +- systemd units rework + +* Thu Jan 23 2014 Jaromir Capik - 3.3.5-1 +- Update to 3.3.5 (#1056448) + +* Sun Jan 19 2014 Ville Skyttä - 3.3.4-11 +- Do not order services after syslog.target. + +* Fri Jan 10 2014 Jaromir Capik - 3.3.4-10 +- Enhancing the sensord service wrapper (#863986) +- UsrMove and libexec path tunings + +* Thu Jan 09 2014 Jaromir Capik - 3.3.4-9 +- Introducing sensord service wrapper (#949521) + +* Mon Sep 09 2013 Jaromir Capik - 3.3.4-8 +- Fixing use of uninitialized 'vendor_id' value on ppc (#996590) +- Fixing bogus date in the changelog + +* Wed Aug 07 2013 Jaromir Capik - 3.3.4-7 +- Fixing the license tag + +* Sat Aug 03 2013 Petr Pisar - 3.3.4-6 +- Perl 5.18 rebuild + +* Thu Aug 01 2013 Jaromir Capik - 3.3.4-5 +- RH man page scan (#948520) + +* Tue Jul 30 2013 Jaromir Capik - 3.3.4-4 +- Avoiding modprobe errors when no sensors configured (#834215) +- Introducing fancontrol service file (#988922) +- Replacing hardcoded systemd unit path with _unitdir macro + +* Thu Jul 25 2013 Jaromir Capik - 3.3.4-3 +- Avoiding warnings when piping /dev/null to sensors-detect (#843507) + +* Wed Jul 17 2013 Petr Pisar - 3.3.4-2 +- Perl 5.18 rebuild + +* Wed May 29 2013 Jaromir Capik - 3.3.4-1 +- Update to 3.3.4 + +* Thu Feb 14 2013 Fedora Release Engineering - 3.3.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jan 17 2013 Jaromir Capik - 3.3.3-2 +- Fixing sensors-detect to avoid failures when the /dev/port is missing (#843521) + +* Thu Dec 06 2012 Jaromir Capik - 3.3.3-1 +- Update to 3.3.3 + +* Wed Sep 26 2012 Jaromir Capik - 3.3.2-5 +- #856120 - sensors - Inconsistency between man page and help + +* Mon Aug 27 2012 Jaromir Capik - 3.3.2-4 +- Migration to new systemd scriptlet macros + +* Thu Jul 19 2012 Fedora Release Engineering - 3.3.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Apr 02 2012 Nikola Pajkovsky - 3.3.2-2 +- rhbz#806364 - sensors-detect fails with "/sys/bus/pci/devices: No such file or directory at /usr/sbin/sensors-detect line 2895" + PCI bus is always required even if it might be missing on + some platforms. So don't choke is it is missing. Patch from + Jaromir Capik + +* Thu Mar 15 2012 Nikola Pajkovsky - 3.3.2-1 +- upstream lm-sensors-3.3.2 + +* Mon Feb 13 2012 Nikola Pajkovsky - 3.3.1-3 +- 789761 - Provide native systemd service + +* Fri Jan 13 2012 Fedora Release Engineering - 3.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Jul 22 2011 Nikola Pajkovsky - 3.3.1-1 +- new upstream release 3.3.1 + +* Sun Apr 24 2011 Hans de Goede - 3.3.0-2 +- Fix sensors-detect with the udevdb now living under /run (#697565) +- Provide a native systemd service file (#692159) +- Drop systemv initscript +- Drop configuration conversion scripts, the last Fedora with lm_sensors-2.x + was Fedora 8 ! + +* Tue Mar 29 2011 Nikola Pajkovsky - 3.3.0 +- new upstream release 3.3.0 +- Resolved: 691548 - include empty /etc/sensors.d into the package + +* Tue Feb 08 2011 Fedora Release Engineering - 3.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Oct 11 2010 Nikola Pajkovsky - 3.2.0 +- new upstream release 3.2.0 +- change lincese to LGPLv2.1 + +* Fri Sep 03 2010 Nikola Pajkovsky - 3.1.2.svn5857 +- update lm_sensors from svn +- drop patch lm_sensors-3.1.2-lm85.patch(already in svn) + +* Wed Mar 31 2010 Nikola Pajkovsky - 3.1.2-2 +- patch lm_sensors-3.1.2-lm85.patch add into sensors-detect driver lm85 +- Resolved: 578527 - sensors-detect fails to detect + +* Wed Feb 3 2010 Nikola Pajkovsky - 3.1.2-1 +- new upstream release +- drop sensors-detect, beacuse it was taken form svn(531126) + +* Thu Dec 17 2009 Nikola Pajkovsky - 3.1.1-7 +- Resovles: #226101 - Merge Review: lm_sensors + +* Tue Nov 10 2009 Dennis Gilmore - 3.1.1-6 +- remove Excludearch s390 s390x + +* Tue Nov 10 2009 Nikola Pajkovsky - 3.1.1-5 +- Resolved: 531126 - sensors-detect gives perl uninitialized var warnings + +* Wed Sep 30 2009 Hans de Goede 3.1.1-4 +- Create a sensor3.conf.5 symlink to the sensors.conf.5 manpage (#526178) + +* Sat Jul 25 2009 Fedora Release Engineering - 3.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri Jul 10 2009 Adam Jackson 3.1.1-2 +- Add -libs subpackage so perl doesn't get dragged in just for linking + against libsensors. + +* Tue Jul 7 2009 Nikola Pajokvsky 3.1.1-1 +- New release 3.1.1 + +* Sun Mar 8 2009 Hans de Goede 3.1.0-1 +- New upstream release 3.1.0 + +* Wed Feb 25 2009 Fedora Release Engineering - 3.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Jan 1 2009 Hans de Goede 3.0.3-1 +- New upstream release 3.0.3 +- Add a patch to support drivers with an ACPI "bus" (new Asus atk0110 drv) + +* Tue Jul 1 2008 Hans de Goede 3.0.2-1 +- New upstream release 3.0.2 +- This release contains various important fixes to sensors-detect, which made + it unsafe to run sensors-detect on certain systems +- Drop all patches (all upstreamed) + +* Sat Jun 14 2008 Hans de Goede 3.0.1-6 +- Rebuild for new rrdtool + +* Sun Mar 16 2008 Hans de Goede 3.0.1-5 +- Make libsensors work with hwmon class entries without a device link + such as the acpi thermal_zone driver (bz 437637) + +* Wed Mar 12 2008 Hans de Goede 3.0.1-4 +- One (last) minor cosmetical fix to the initscript + +* Tue Feb 26 2008 Hans de Goede 3.0.1-3 +- Some improvements to the lsb-retcodes and service-default-off patches + from a review by upstream + +* Tue Feb 19 2008 Fedora Release Engineering - 3.0.1-2 +- Autorebuild for GCC 4.3 + +* Mon Feb 11 2008 Hans de Goede 3.0.1-1 +- New upstream release 3.0.1 +- Drop several patches which are included in the new upstream release +- Add a patch to make the initscript returncodes LSB compliant (bug 431884) + +* Tue Dec 18 2007 Hans de Goede 3.0.0-3 +- Fix sensors.conf errors with certain chips (patch send in by upstream) + +* Thu Dec 13 2007 Hans de Goede 3.0.0-2 +- Fix sensord rdd mode (patch send in by upstream) + +* Sat Nov 24 2007 Hans de Goede 3.0.0-1 +- New upstream release 3.0.0 (final) + +* Sat Nov 10 2007 Hans de Goede - 3.0.0-0.1.rc3 +- New upstream release 3.0.0-rc3 +- Remove eeprommer sub-package as eeprommer (and the other i2c-tools) + have moved to the new i2c-tools package + +* Wed Aug 22 2007 Hans de Goede - 2.10.4-2 +- Update License tag for new Licensing Guidelines compliance +- Disable service by default (no use without any sensors being configured), + enable it automatically on a successfull sensors-detect run (bz 253750) + +* Thu Jul 19 2007 Hans de Goede - 2.10.4-1 +- New upstream release 2.10.4 +- Drop upstreamed patches 4, 5, 7 and 8 +- Drop no longer need patch 3 +- Move libsensors.3 manpage to -devel sub-package +- Move sensord.8 manpage to -sensord sub-package +- Switch from ExclusiveArch: alph ix86 x86_64, to ExcludeArch: s390 s390x, + so that we get build on ppc, arm, etc. too. (bz 181037 amongst others) + +* Mon Jul 9 2007 Hans de Goede - 2.10.3-3 +- Remove no longer needed patches 1, 2 & 6 +- Various specfile cleanups to match the Fedora packaging guidelines + this fixes bz 238787 amongst other things +- Use lm_sensors provided initscript instead of our own private one, this + stops the sometimes unnecessary loading of i2c-dev +- No longer ship a static version of the library in -devel +- Compile sensord and eepromer extra programs and put each in its own + subpackage (bz 236904) + +* Tue Apr 17 2007 Phil Knirsch - 2.10.3-2 +- Fixed one more problem with sensors-detect (#215984) + +* Tue Apr 17 2007 Phil Knirsch - 2.10.3-1 +- Update to lm_sensors-2.10.3 + +* Thu Mar 15 2007 Phil Knirsch - 2.10.2-2 +- Only require dmidecode on supported archs (#232264) + +* Tue Feb 06 2007 Florian La Roche - 2.10.2-1 +- Update to lm_sensors-2.10.2 + +* Thu Nov 23 2006 Phil Knirsch - 2.10.1-1.fc7 +- Update to lm_sensors-2.10.1 +- Tiny specfile updates + +* Wed Jul 12 2006 Jesse Keating - 2.10.0-3.1 +- rebuild + +* Sun Jul 09 2006 Warren Togami 2.10.0-3 +- change buildreq from sysfsutils-devel to libsysfs-devel (#198055) + +* Mon Jun 05 2006 Jesse Keating 2.10.0-2 +- Fix BuildRequires, added flex. (#193511) Changed to Requires(post) and + (postun) + +* Fri May 12 2006 Phil Knirsch 2.10.0-1 +- Update to lm_sensors-2.10.0 +- Added missing buildprereq on sysfsutils-devel (#189196) +- Added missing prereq on chkconfig (#182838) +- Some fiddling to make it build on latest kernels + +* Wed Feb 15 2006 Phil Knirsch 2.9.2-2 +- Added missing dependency to chkconfig + +* Fri Feb 10 2006 Phil Knirsch 2.9.2-1 +- Update to lm_sensors-2.9.2 +- Fixed wrong subsys locking (#176965) +- Removed lm_sensors pwmconfig, has been fixed upstream now + +* Tue Feb 07 2006 Jesse Keating - 2.9.1-6.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Mon Jan 16 2006 Peter Jones 2.9.1-6 +- fix initscript subsys locking + +* Fri Dec 16 2005 Jesse Keating 2.9.1-5.1 +- rebuilt for new gcj + +* Tue Nov 08 2005 Phil Knirsch 2.9.1-5 +- Fixed lm_sensors pwmconfig patch. + +* Thu Sep 01 2005 Phil Knirsch 2.9.1-4 +- Fixed CAN-2005-2672 lm_sensors pwmconfig insecure temporary file usage + (#166673) +- Fixed missing optflags during build (#166910) + +* Mon May 23 2005 Phil Knirsch 2.9.1-3 +- Update to lm_sensors-2.9.1 +- Fixed wrong/missing location variables for make user +- Fixed missing check for /etc/modprobe.conf in sensors-detect (#139245) + +* Wed Mar 02 2005 Phil Knirsch 2.8.8-5 +- bump release and rebuild with gcc 4 + +* Tue Jan 11 2005 Dave Jones 2.8.8-4 +- Add dependancy on dmidecode rather than the obsolete kernel-utils. +- Don't delete dmidecode from the buildroot. + +* Thu Dec 23 2004 Phil Knirsch 2.8.8-2 +- Fixed typo in initscript (#139030) + +* Tue Dec 21 2004 Phil Knirsch 2.8.8-1 +- Added Buildprereq for bison (#138888) +- Update to lm_sensors-2.8.8 + +* Thu Oct 14 2004 Harald Hoyer 2.8.7-2 +- added initial /etc/sysconfig/lm_sensors +- added initscript +- MAKEDEV the initial i2c devices in initscript and sensors-detect + +* Tue Jul 06 2004 Phil Knirsch 2.8.7-1 +- Update to latest upstream version. + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Tue Apr 13 2004 Phil Knirsch 2.8.6-1 +- Update to latest upstream version. +- Enabled build for x86_64. + +* Mon Mar 08 2004 Phil Knirsch 2.8.3-5 +- Fixed initscript to work with 2.6 kernel and made it more quiet (#112286). +- Changed proposed location of sensors (#116496). +- Fixed rpath issue. + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Feb 05 2004 Phil Knirsch 2.8.3-3 +- Modified sensors.conf to a noreplace config file. + +* Wed Feb 04 2004 Phil Knirsch 2.8.3-2 +- Fixed newly included initscript (#114608). + +* Thu Jan 29 2004 Phil Knirsch 2.8.3-1 +- Updated to latest upstream version 2.8.3 + +* Thu Jan 08 2004 Phil Knirsch 2.8.2-1 +- Update to latest upstream version 2.8.2 +- Fixed wrong & usage in if expression. +- Included several new perl tools. + +* Fri Oct 24 2003 Phil Knirsch 2.8.1-1 +- Update to latest upstream version 2.8.1 + +* Wed Jul 23 2003 Phil Knirsch 2.8.0-1 +- Update to latest upstream version 2.8.0 + +* Fri Jun 27 2003 Phil Knirsch 2.6.5-6.1 +- rebuilt + +* Fri Jun 27 2003 Phil Knirsch 2.6.5-6 +- Included prog/init scripts and README (#90606). +- Require kernel-utils for dmidecode (#88367, #65057). + +* Wed Jan 22 2003 Tim Powers 2.6.5-5 +- rebuilt + +* Wed Dec 04 2002 Phil Knirsch 2.6.5-4 +- Bump release and try to rebuild. + +* Tue Dec 3 2002 Tim Powers 2.6.5-3 +- don't include dmidecode, conflicts with kernel-utils + +* Fri Nov 29 2002 Phil Knirsch 2.6.5-2 +- Added patch to fix utf8 problem with sensors-detect. +- Fixed Copyright: to License: in specfile + +* Fri Nov 29 2002 Phil Knirsch 2.6.5-1 +- Updated userlevel to 2.6.5. +- Include all the /usr/sbin/ apps (like dmidecode). + +* Fri Oct 04 2002 Phil Knirsch 2.6.3-3 +- Removed Serverworks patch as it is already in sensors-detect. + +* Fri Jun 21 2002 Tim Powers 2.6.3-2 +- automated rebuild + +* Tue Jun 18 2002 Phil Knirsch 2.6.3-1 +- Updated of userland package to 2.6.3 +- Fixed file packaging bug (#66126). + +* Thu May 23 2002 Tim Powers 2.6.2-2 +- automated rebuild + +* Mon Jan 28 2002 Phil Knirsch 2.6.2-1 +- Update to version 2.6.2 + +* Wed Aug 22 2001 Philipp Knirsch 2.5.5-6 +- Added the SMBus CSB5 detection (#50468) + +* Mon Jul 9 2001 Philipp Knirsch +- Fixed duplicate Summary: entry for devel package (#47714) + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Thu Feb 15 2001 Philipp Knirsch +- Removed the i2c block patch as our newest kernel doesn't need it anymore. + +* Mon Feb 5 2001 Matt Wilson +- added patch to not include sys/perm.h, as it's gone now. +- added alpha to ExclusiveArch +- use make "LINUX_HEADERS=/usr/include" to get kernel headers + +* Tue Jan 16 2001 Philipp Knirsch +- Updated to 2.5.5 which includes the Serverworks drivers. Kernel modules are + not included though es they have to go into the kernel package +- Had to remove all references to I2C_SMBUS_I2C_BLOCK_DATA from + kernel/busses/i2c-i801.c and prog/dump/i2cdump.c as this is not defined in + our current kernel package + +* Tue Dec 19 2000 Philipp Knirsch +- update to 2.5.4 +- updated URL and Source entries to point to new home of lm-sensors +- rebuild + +* Wed Aug 16 2000 Nalin Dahyabhai +- fix summary + +* Fri Jul 28 2000 Harald Hoyer +- added static library to devel package + +* Thu Jul 20 2000 Nalin Dahyabhai +- update to 2.5.2 +- build against a kernel that actually has new i2c code in it + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Mon Jun 12 2000 Nalin Dahyabhai +- initial package without kernel support diff --git a/lm_sensors.sysconfig b/lm_sensors.sysconfig new file mode 100644 index 0000000..334c5ea --- /dev/null +++ b/lm_sensors.sysconfig @@ -0,0 +1,2 @@ +# /etc/sysconfig/lm_sensors - Defines modules loaded by the lm_sensors service +# Run 'sensors-detect' to generate this config file diff --git a/sensord-service-wrapper b/sensord-service-wrapper new file mode 100755 index 0000000..70ca0f1 --- /dev/null +++ b/sensord-service-wrapper @@ -0,0 +1,13 @@ +#!/bin/sh + +. /etc/sysconfig/sensord + +ARGS="" +[ "$INTERVAL" = "" ] || ARGS=`echo "$ARGS -i $INTERVAL"` +[ "$LOG_INTERVAL" = "" ] || ARGS=`echo "$ARGS -l $LOG_INTERVAL"` +[ "$RRD_INTERVAL" = "" ] || ARGS=`echo "$ARGS -t $RRD_INTERVAL"` +[ "$RRD_LOGFILE" = "" ] || ARGS=`echo "$ARGS -r $RRD_LOGFILE"` +[ "$RRD_NO_AVG" = "1" ] && ARGS=`echo "$ARGS -T"` +[ "$LOAD_AVG" = "1" ] && ARGS=`echo "$ARGS -a"` + +/usr/sbin/sensord -f daemon $ARGS diff --git a/sensord.service b/sensord.service new file mode 100644 index 0000000..2bc5539 --- /dev/null +++ b/sensord.service @@ -0,0 +1,12 @@ +[Unit] +Description=Hardware Monitoring Data Logger +After=lm_sensors.service + +[Service] +EnvironmentFile=-/etc/sysconfig/sensord +Type=forking +PIDFile=/var/run/sensord.pid +ExecStart=@WRAPPER_DIR@/sensord-service-wrapper + +[Install] +WantedBy=multi-user.target diff --git a/sensord.sysconfig b/sensord.sysconfig new file mode 100644 index 0000000..8f00618 --- /dev/null +++ b/sensord.sysconfig @@ -0,0 +1,21 @@ +# configuration for harware sensors monitoring daemon +# use suffix "m" for minutes, "s" for seconds, "h" for hours +# 0 turns the facility off + +# interval between scanning alarms +INTERVAL=1m + +# interval between logging +LOG_INTERVAL=20m + +# interval between RRD logging +# RRD_INTERVAL=1m + +# RRD db location +# RRD_LOGFILE=/var/log/sensors.rrd + +# Switch RRD in non-average mode ... 1 - enabled, 0 - disabled (default) +# RRD_NO_AVG=1 + +# Include load average in RRD ... 1 - enabled, 0 - disabled (default) +# LOAD_AVG=1 diff --git a/sources b/sources new file mode 100644 index 0000000..9f385a1 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (lm-sensors-70f7e0848410b9ca4dde7abff669bbbecbf137e0.tar.gz) = 90a17af6f70e7588b2214a8beb69e51d96a2fe09be6fc19c0fb1d2e8c4c911cd5dc0487637dc7aa5e45cf92382a11d32344487a682e88bd1918b73986954c69d