pool/sensors
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 215379 from Base:System

Browse Source 
- Update to lm_sensors 3.3.5
 * includes a libsensors fix needed for recent Intel processors (coretemp driver)
 * sensors-detect: Detection of new devices, added non-interactive (automatic) mode
- Package COPYING and COPYING.LGPL as requested by legal team

OBS-URL: https://build.opensuse.org/request/show/215379
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sensors?expand=0&rev=89
This commit is contained in:
Stephan Kulow 2014-01-29 06:17:07 +00:00 committed by Git OBS Bridge
commit 6aa7c5e082
7 changed files with 65 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lm_sensors-3.0.0-sysconfig_metadata.patch
View File

@ -4,7 +4,7 @@
--- lm_sensors-3.3.2.orig/prog/detect/sensors-detect
+++ lm_sensors-3.3.2/prog/detect/sensors-detect
@@ -6693,6 +6693,12 @@ sub write_config
@@ -6784,6 +6784,12 @@ sub write_config
or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)";
print SYSCONFIG "# Generated by sensors-detect on " . scalar localtime() . "\n";
print SYSCONFIG <<'EOT';

29
lm_sensors-3.0.3-hint-at-kernel-extra-package.patch
View File

@ -3,21 +3,22 @@ that not all required hwmon drivers are installed on the system when
sensors-detect is being run. Point the user to the kernel-*-extra
package if drivers are found to be missing.
---
prog/detect/sensors-detect | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
prog/detect/sensors-detect | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
--- lm_sensors-3.3.2.orig/prog/detect/sensors-detect
+++ lm_sensors-3.3.2/prog/detect/sensors-detect
@@ -2616,12 +2616,15 @@ sub initialize_conf
@@ -2669,13 +2669,16 @@ sub initialize_conf
# [2] -> SUBLEVEL
# [3] -> EXTRAVERSION
#
-use vars qw(@kernel_version $kernel_arch);
+use vars qw(@kernel_version $kernel_flavor $kernel_arch);
-use vars qw($kernel_version @kernel_version $kernel_arch);
+use vars qw($kernel_version @kernel_version $kernel_flavor $kernel_arch);
sub initialize_kernel_version
{
`uname -r` =~ /(\d+)\.(\d+)\.(\d+)(.*)/;
chomp($kernel_version = `uname -r`);
$kernel_version =~ /(\d+)\.(\d+)\.(\d+)(.*)/;
@kernel_version = ($1, $2, $3, $4);
+ if ($kernel_version[3] =~ /-([a-z]+)$/) {
+ chomp($kernel_flavor = $1);
@ -25,16 +26,12 @@ package if drivers are found to be missing.
chomp($kernel_arch = `uname -m`);
# We only support kernels >= 2.6.5
@@ -6635,7 +6638,11 @@ sub generate_modprobes
# isn't supported
if ((($? >> 8) == 0) && ! $modulefound) {
@@ -6729,6 +6732,8 @@ sub generate_modprobes
print "Warning: the required module $driver is not currently installed\n".
- "on your system. If it is built into the kernel then it's OK.\n".
+ "on your system. ".
+ ($kernel_flavor ?
+ "You may need to install package\n".
+ "kernel-$kernel_flavor-extra for lm-sensors to work properly.\n" :
+ "If it is built into the kernel then it's OK.\n").
"Otherwise, check http://www.lm-sensors.org/wiki/Devices for\n".
"on your system. Check http://www.lm-sensors.org/wiki/Devices for\n".
"driver availability.\n\n";
+ print "You may need to install package kernel-$kernel_flavor-extra for\n".
+ "lm-sensors to work properly.\n\n" if $kernel_flavor;
} else {
$hwmon_modules{$driver}++
unless hwmon_is_autoloaded($driver);

3
lm_sensors-3.3.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b4608610cb5de4b24e3fe1ae357712e8633a8a929bbb42df5eecc4ccee6ba76d
size 172226

3
lm_sensors-3.3.5.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5dae6a665e1150159a93743c4ff1943a7efe02cd9d3bb12c4805e7d7adcf4fcf
size 173609

31
lm_sensors-r6181-fix-service-files.patch
View File

@ -1,31 +0,0 @@
Subject: Fix EnvironmentFile in service files
Upstream: yes, r6181
* EnvironmentFile is mandatory for sensord.
* fancontrol needs no EnvironmentFile.
---
prog/init/fancontrol.service | 1 -
prog/init/sensord.service | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
--- a/prog/init/fancontrol.service
+++ b/prog/init/fancontrol.service
@@ -4,7 +4,6 @@ ConditionFileNotEmpty=/etc/fancontrol
After=lm_sensors.service
[Service]
-EnvironmentFile=/etc/sysconfig/lm_sensors
Type=simple
PIDFile=/var/run/fancontrol.pid
ExecStart=/usr/sbin/fancontrol
--- a/prog/init/sensord.service
+++ b/prog/init/sensord.service
@@ -4,7 +4,7 @@ After=lm_sensors.service
After=syslog.target
[Service]
-EnvironmentFile=-/etc/sysconfig/sensord
+EnvironmentFile=/etc/sysconfig/sensord
Type=forking
PIDFile=/var/run/sensord.pid
ExecStart=/usr/sbin/sensord -i $INTERVAL -l $LOG_INTERVAL -f daemon

24
sensors.changes
View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Tue Jan 28 09:08:45 CET 2014 - jdelvare@suse.de
- Package COPYING and COPYING.LGPL.
-------------------------------------------------------------------
Wed Jan 22 10:24:21 CET 2014 - jdelvare@suse.de
- Package new file /usr/share/man/man8/sensors-conf-convert.8.gz.
-------------------------------------------------------------------
Wed Jan 22 10:08:21 CET 2014 - jdelvare@suse.de
- Update to lm_sensors 3.3.5
* library: Support up to 33 sensors of the same type per
monitoring chip (needed for recent Intel processors, coretemp
driver)
* sensors-detect: Detection of new devices
Added non-interactive (automatic) mode
* lm_sensors-r6181-fix-service-files.patch: Removed, upstream
now.
* lm_sensors-3.0.0-sysconfig_metadata.patch,
lm_sensors-3.0.3-hint-at-kernel-extra-package.patch: Refreshed.
-------------------------------------------------------------------
Wed Oct 23 15:38:06 UTC 2013 - p.drouand@gmail.com

39
sensors.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package sensors
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -22,7 +22,7 @@ BuildRequires: flex
BuildRequires: rrdtool-devel
BuildRequires: systemd-rpm-macros
Url: http://www.lm-sensors.org/
Version: 3.3.4
Version: 3.3.5
Release: 0
Summary: Hardware health monitoring for Linux
License: GPL-2.0+
@ -34,7 +34,6 @@ Patch1: lm_sensors-3.1.1-build.patch
Patch2: lm_sensors-3.0.0-sensord-separate.patch
Patch3: lm_sensors-3.0.0-sysconfig_metadata.patch
Patch4: lm_sensors-3.0.3-hint-at-kernel-extra-package.patch
Patch5: lm_sensors-r6181-fix-service-files.patch
ExcludeArch: s390 s390x
%{?systemd_requires}
@ -95,7 +94,6 @@ sense to the user.
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%build
RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
@ -103,16 +101,13 @@ make %{?_smp_mflags} PROG_EXTRA:=sensord BUILD_STATIC_LIB:=0 PREFIX=%{_prefix} M
%install
make PROG_EXTRA:=sensord BUILD_STATIC_LIB:=0 PREFIX=%{_prefix} MANDIR=%{_mandir} LIBDIR=%{_libdir} DESTDIR=$RPM_BUILD_ROOT install
cd doc/
mkdir -p $RPM_BUILD_ROOT/%{_docdir}/sensors
cp -a donations $RPM_BUILD_ROOT/%{_docdir}/sensors/
cp -a fan-divisors $RPM_BUILD_ROOT/%{_docdir}/sensors/
cp -a fancontrol.txt $RPM_BUILD_ROOT/%{_docdir}/sensors/
cp -a temperature-sensors $RPM_BUILD_ROOT/%{_docdir}/sensors/
cp -a vid $RPM_BUILD_ROOT/%{_docdir}/sensors/
cp -a progs $RPM_BUILD_ROOT/%{_docdir}/sensors/
chmod -R u+rwX,g+rX,o+rX $RPM_BUILD_ROOT/%{_docdir}/sensors/
cd ../
mkdir -p $RPM_BUILD_ROOT/%{_docdir}/sensors $RPM_BUILD_ROOT/%{_docdir}/sensord
cp -a doc/donations doc/fan-divisors \
doc/fancontrol.txt doc/libsensors-API.txt \
doc/progs doc/temperature-sensors \
doc/vid COPYING COPYING.LGPL $RPM_BUILD_ROOT/%{_docdir}/sensors/
cp -a COPYING $RPM_BUILD_ROOT/%{_docdir}/sensord/
chmod -R u+rwX,g+rX,o+rX $RPM_BUILD_ROOT/%{_docdir}/sensors/ $RPM_BUILD_ROOT/%{_docdir}/sensord/
chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/libsensors.so.*
mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
cp -a prog/init/*.service $RPM_BUILD_ROOT/%{_unitdir}/
@ -168,7 +163,14 @@ fi
%endif
/usr/sbin/pwmconfig
/usr/sbin/sensors-detect
%doc %{_docdir}/sensors/
%dir %{_docdir}/sensors
%doc %{_docdir}/sensors/donations
%doc %{_docdir}/sensors/fan-divisors
%doc %{_docdir}/sensors/fancontrol.txt
%doc %{_docdir}/sensors/progs
%doc %{_docdir}/sensors/temperature-sensors
%doc %{_docdir}/sensors/vid
%doc %{_docdir}/sensors/COPYING
%doc /usr/share/man/man1/*.1.gz
%doc /usr/share/man/man8/fancontrol.8.gz
%ifarch i386 i486 i586 i686 x86_64
@ -176,12 +178,15 @@ fi
%doc /usr/share/man/man8/isaset.8.gz
%endif
%doc /usr/share/man/man8/pwmconfig.8.gz
%doc /usr/share/man/man8/sensors-conf-convert.8.gz
%doc /usr/share/man/man8/sensors-detect.8.gz
%files -n sensord
%defattr(-,root,root)
%{_unitdir}/sensord.service
/usr/sbin/sensord
%dir %{_docdir}/sensord
%doc %{_docdir}/sensord/COPYING
%doc /usr/share/man/man8/sensord.8.gz
%files -n libsensors4
@ -189,12 +194,16 @@ fi
%config /etc/sensors3.conf
%config /etc/sensors.d/
%{_libdir}/libsensors.so.4*
%dir %{_docdir}/sensors
%doc %{_docdir}/sensors/COPYING.LGPL
%doc /usr/share/man/man5/*.5.gz
%files -n libsensors4-devel
%defattr(-,root,root)
/usr/include/sensors/
%{_libdir}/libsensors.so
%dir %{_docdir}/sensors
%doc %{_docdir}/sensors/libsensors-API.txt
%doc /usr/share/man/man3/*.3.gz
%changelog