From 016ea9313455a9d6538e1b3797df44ea63e8528c Mon Sep 17 00:00:00 2001 From: Packit Service Date: Nov 30 2020 13:44:25 +0000 Subject: Prepare for a new update Reverting patches so we can apply the latest update and changes can be seen in the spec file and sources. --- diff --git a/CHANGES b/CHANGES index d2e7e8d..6efba0f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,9 +1,7 @@ lm-sensors CHANGES file ----------------------- -git HEAD - Development version string now contains "+git" instead of "+SVN" - Updated links in documentation to reflect the new home of lm_sensors +SVN HEAD 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 2f5859f..d6f2192 100644 --- a/Makefile +++ b/Makefile @@ -226,7 +226,7 @@ manhtml: cp $(MANPAGES) html cd html ; \ export LOGNAME=sensors ; \ - export HOSTNAME=hwmon.wiki.kernel.org ; \ + export HOSTNAME=www.lm-sensors.org ; \ man2html *.[1-8] ; \ $(RM) *.[1-8] diff --git a/README b/README index 9ce510b..acd3c6e 100644 --- a/README +++ b/README @@ -101,22 +101,14 @@ for such programs. OTHER INFORMATION ----------------- -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 +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 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/lm-sensors/lm-sensors. +https://github.com/groeck/lm-sensors. LICENSE ------- diff --git a/configs/Asus/P3-PH4C.conf b/configs/Asus/P3-PH4C.conf index 28b3257..00e5dab 100644 --- a/configs/Asus/P3-PH4C.conf +++ b/configs/Asus/P3-PH4C.conf @@ -5,8 +5,7 @@ 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 5aa506c..bf62b6e 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 https://hwmon.wiki.kernel.org/asusformulahacking. The formulas +# Everythings based on the guide at http://www.lm-sensors.org/wiki/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 31ced1e..8632e09 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 https://hwmon.wiki.kernel.org/asusformulahacking) +# (see http://www.lm-sensors.org/wiki/AsusFormulaHacking) chip "w83791d-*" diff --git a/configs/Biostar/N68S+.conf b/configs/Biostar/N68S+.conf index ddace3c..be340df 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 -# https://github.com/lm-sensors/lm-sensors/tree/master/configs +# http://www.lm-sensors.org/wiki/Configurations # 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 5f8d36c..53a2376 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 https://hwmon.wiki.kernel.org/feedbackandsupport +# More info at http://www.lm-sensors.org/wiki/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 cf23955..fd9495a 100644 --- a/doc/developers/lm_sensors.lsm +++ b/doc/developers/lm_sensors.lsm @@ -6,11 +6,13 @@ 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. - https://hwmon.wiki.kernel.org/lm_sensors + http://www.lm-sensors.org/ Keywords: sensors health hardware-monitoring fan-speed Author: jdelvare@suse.de (Jean Delvare) -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 +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/ Copying-policy: GPL/LGPL End diff --git a/doc/developers/release_checklist b/doc/developers/release_checklist index a97745e..9ea1ddf 100644 --- a/doc/developers/release_checklist +++ b/doc/developers/release_checklist @@ -10,19 +10,32 @@ 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 -- grep for LM_VERSION and update values of the constants +- Update version.h - Commit -- Tag the release using git: - git tag V3-x-x - git push origin V3-x-x +- 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}' After release, remember to: -- 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 +- Update the Download page on lm-sensors.org, then add a news item - Announce on the lm-sensors mailing list -- grep for LM_VERSION and add "+git" to the values of the constants -- Commit +- 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' - 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 4a30c2d..92eea57 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 -https://hwmon.wiki.kernel.org/authorsandcontributors. Thanks! +http://www.lm-sensors.org/wiki/AuthorsAndContributors. Thanks! Donations are listed in chronological order. Note that the person mentioned diff --git a/doc/git b/doc/git index beeaedd..1c433d2 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/lm-sensors/lm-sensors.git +git clone https://github.com/groeck/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 0c5464d..e9e997a 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/lm-sensors/lm-sensors/ +see https://github.com/groeck/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 15bc26f..1bd3935 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: -# https://github.com/lm-sensors/lm-sensors/tree/master/configs/Abit +# http://www.lm-sensors.org/trac/wiki/Configurations/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: -# https://github.com/lm-sensors/lm-sensors/tree/master/configs +# http://www.lm-sensors.org/trac/wiki/Configurations/ # 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 995c830..bfb67c4 100644 --- a/lib/libsensors.3 +++ b/lib/libsensors.3 @@ -286,4 +286,5 @@ sensors.conf(5) .SH AUTHOR Frodo Looijaard, Jean Delvare and others -https://hwmon.wiki.kernel.org/lm_sensors +http://www.lm-sensors.org/ + diff --git a/lib/sensors.conf.5 b/lib/sensors.conf.5 index 843a211..d869523 100644 --- a/lib/sensors.conf.5 +++ b/lib/sensors.conf.5 @@ -567,4 +567,7 @@ libsensors(3) .SH AUTHOR Frodo Looijaard and the lm_sensors group -https://hwmon.wiki.kernel.org/lm_sensors +http://www.lm-sensors.org/ + + + diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect index 8ee1c1b..b1b4b20 100755 --- a/prog/detect/sensors-detect +++ b/prog/detect/sensors-detect @@ -38,9 +38,12 @@ 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 @i2c_byte_cache %opt); + $i2c_addresses_to_scan $revision @i2c_byte_cache %opt); + +$revision = '$Revision$ ($Date$)'; +$revision =~ s/\$\w+: (.*?) \$/$1/g; +$revision =~ s/ \([^()]*\)//; # 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 @@ -2770,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') }, }, { name => "AMD Family 15h power sensors", driver => "fam15h_power", @@ -3100,7 +3103,7 @@ sub initialize_cpu_list }; next; } - if (m/^(vendor_id|cpu family|model|model name|stepping|cpuid level|cpu|revision)\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 @@ -3116,16 +3119,7 @@ sub initialize_cpu_list sub print_cpu_info { my $cpu = $cpu[0]; - 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"; - } + 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 @@ -7291,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 https://hwmon.wiki.kernel.org/device_support_status for updates.\n\n"; + "Check http://www.lm-sensors.org/wiki/Devices for updates.\n\n"; } elsif (!is_module_builtin($driver)) { open(local *INPUTFILE, "modprobe -l $driver 2>/dev/null |"); local $_; @@ -7307,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 https://hwmon.wiki.kernel.org/device_support_status for\n". + "on your system. Check http://www.lm-sensors.org/wiki/Devices for\n". "driver availability.\n\n"; } else { $hwmon_modules{$driver}++ @@ -7472,7 +7466,7 @@ sub main system("/sbin/service", "lm_sensors", "stop"); } - print "# sensors-detect version ".LM_VERSION."\n"; + print "# sensors-detect revision $revision\n"; initialize_dmi_data(); print_dmi_summary(); print_kernel_version(); @@ -7597,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". - "https://hwmon.wiki.kernel.org/device_support_status for driver status.\n"; + "http://www.lm-sensors.org/wiki/Devices for driver status.\n"; } exit; } diff --git a/prog/dump/isadump.8 b/prog/dump/isadump.8 index 1fa09fd..6bf5ea4 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 -(https://hwmon.wiki.kernel.org/lm_sensors) +(http://www.lm-sensors.org/) .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 4051af9..e7bcd5d 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 -(https://hwmon.wiki.kernel.org/lm_sensors) +(http://www.lm-sensors.org/) .PP This manual page was shamelessly ripped from the i2cset and isadump manual pages by Jean Delvare. diff --git a/prog/init/fancontrol.init b/prog/init/fancontrol.init index 8ab2c92..eabe734 100755 --- a/prog/init/fancontrol.init +++ b/prog/init/fancontrol.init @@ -1,5 +1,7 @@ #!/bin/sh # +# $Id$ +# # fancontrol # # chkconfig: 2345 90 01 diff --git a/prog/init/lm_sensors.init b/prog/init/lm_sensors.init index 2ad58ab..77172d2 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: -# https://hwmon.wiki.kernel.org/lm_sensors +# http://www.lm-sensors.org # 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/pwm/pwmconfig b/prog/pwm/pwmconfig index d18e0de..c24c891 100755 --- a/prog/pwm/pwmconfig +++ b/prog/pwm/pwmconfig @@ -29,7 +29,8 @@ # # -LM_VERSION='3.4.0+git' +REVISION=$(echo '$Revision$' | cut -d' ' -f2) +REVDATE=$(echo '$Date$' | cut -d' ' -f2) PIDFILE="/var/run/fancontrol.pid" if [ -f "$PIDFILE" ] @@ -47,7 +48,7 @@ then exit 1 fi -echo "# pwmconfig version $LM_VERSION" +echo "# pwmconfig revision $REVISION ($REVDATE)" 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/prog/rrd/sens_day.in b/prog/rrd/sens_day.in index 15412f2..75dc13b 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 2b92f65..cce5055 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 7051d5f..713197d 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 a531362..3cde7f1 100644 --- a/prog/sensord/rrd.c +++ b/prog/sensord/rrd.c @@ -498,8 +498,7 @@ 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 7d66e4b..ea0e238 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 -https://hwmon.wiki.kernel.org/lm_sensors +http://www.lm-sensors.org/ diff --git a/prog/tellerstats/index.shtml b/prog/tellerstats/index.shtml index 1b71376..60c8ca1 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 bbdc04d..ad74e71 100644 --- a/version.h +++ b/version.h @@ -1 +1 @@ -#define LM_VERSION "3.4.0+git" +#define LM_VERSION "3.4.0+SVN"