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

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sensors?expand=0&rev=25

Browse Source
This commit is contained in:
OBS User unknown 2007-11-28 22:49:25 +00:00 committed by Git OBS Bridge
parent 642b8fe234
commit 1af1997421
10 changed files with 60 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
README.SuSE
View File

@ -1,27 +0,0 @@
(English version below)
Hardware Ueberwachung fuer Linux
==============================
Das Paket "sensors" enthaelt die erforderlichen Programme (sensors), um
Daten einiger bekannten Sensor-Chips auslesen zu koennen. Die erforderliche
Schnittstelle wird durch Laden von Kernel-Modulen unter /proc/bus/i2c/
bereitgestellt. Welche Module geladen werden muessen, kann als root mit
dem Programm /usr/sbin/sensors-detect interaktiv ermittelt werden.
Die Konfiguration in /etc/sensors.conf sollte auf die tatsaechlichen
Gegebenheiten des Mainboards angepasst werden.
---------------------------------------------------------------------------
Hardware health monitoring for Linux
====================================
The sensors package includes the programs (sensors) to show the data of
some sensor chips. The interface /proc/bus/i2c/ is provided by loading
kernel modules. Which modules should been loaded can be interactively
detected as root by calling /usr/sbin/sensors-detect. The default
configuration in /etc/sensors.conf should be changed to fit the actual
circumstances of the mainboard.
Your SuSE Team

3
lm_sensors-2.10.5.tar.bz2
View File

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

11
lm_sensors-2.7.0-kernelheaders.dif
View File

@ -1,11 +0,0 @@
--- Makefile
+++ Makefile
@@ -116,7 +116,7 @@
# you will be able to use '#include <linux/sensors.h>' regardless of the
# current kernel selected.
INCLUDEDIR := $(PREFIX)/include
-SYSINCLUDEDIR := $(INCLUDEDIR)/linux
+SYSINCLUDEDIR := $(LINUX_HEADERS)
LIBINCLUDEDIR := $(INCLUDEDIR)/sensors
# You should not need to change this. It is the base directory under which the

6
lm_sensors-2.10.5-sensord-separate.dif → lm_sensors-3.0.0-sensord-separate.dif
View File

@ -1,8 +1,8 @@
Index: lm_sensors-2.10.5/doc/progs Index: doc/progs
=================================================================== ===================================================================
--- doc/progs --- doc/progs.orig
+++ doc/progs +++ doc/progs
@@ -100,6 +100,8 @@ see http://www.lm-sensors.org/wiki/Usefu @@ -58,6 +58,8 @@ see http://www.lm-sensors.org/wiki/Usefu
the sensors hardware to syslog, and to alert (using syslog level ALERT) the sensors hardware to syslog, and to alert (using syslog level ALERT)
when a sensor alarm is signalled; for example, if a fan fails, a temperature when a sensor alarm is signalled; for example, if a fan fails, a temperature
limit is exceeded, etc. limit is exceeded, etc.

6
lm_sensors-2.10.4-sysconfig_metadata.patch → lm_sensors-3.0.0-sysconfig_metadata.patch
View File

@ -1,6 +1,8 @@
--- prog/detect/sensors-detect Index: prog/detect/sensors-detect
===================================================================
--- prog/detect/sensors-detect.orig
+++ prog/detect/sensors-detect +++ prog/detect/sensors-detect
@@ -5756,6 +5756,12 @@ @@ -5898,6 +5898,12 @@ sub main
open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors") open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors")
or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)"; or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)";
print SYSCONFIG <<'EOT'; print SYSCONFIG <<'EOT';

28
lm_sensors-2.10.5.dif → lm_sensors-3.0.0.dif
View File

@ -2,18 +2,7 @@ Index: Makefile
=================================================================== ===================================================================
--- Makefile.orig --- Makefile.orig
+++ Makefile +++ Makefile
@@ -45,8 +45,8 @@ LINUX_HEADERS := $(LINUX)/include @@ -38,7 +38,7 @@ DEBUG := 0
# may be used mistakenly. Note: This should point to the directory
# *above* the linux/ subdirectory, so to /usr/local/include in the
# above example.
-I2C_HEADERS := /usr/local/include
-#I2C_HEADERS := $(LINUX_HEADERS)
+#I2C_HEADERS := /usr/local/include
+I2C_HEADERS := $(LINUX_HEADERS)
ifneq ($(MAKECMDGOALS),user)
ifneq ($(MAKECMDGOALS),user_install)
@@ -75,7 +75,7 @@ DEBUG := 0
DESTDIR := DESTDIR :=
# This is the prefix that will be used for almost all directories below. # This is the prefix that will be used for almost all directories below.
@ -22,16 +11,7 @@ Index: Makefile
# Your C compiler # Your C compiler
CC := gcc CC := gcc
@@ -99,7 +99,7 @@ ifeq (,$(findstring /2.4., /$(KERNELVERS @@ -71,7 +71,7 @@ LIBINCLUDEDIR := $(INCLUDEDIR)/sensors
else
SYSFS_SUPPORT :=
endif
-#SYSFS_SUPPORT := 1
+SYSFS_SUPPORT := 1
# Prevent 2.6+ users from using improper targets, as this won't work.
ifeq (,$(findstring /2.4., /$(KERNELVERSION)))
@@ -143,7 +143,7 @@ LIBINCLUDEDIR := $(INCLUDEDIR)/sensors
# You should not need to change this. It is the base directory under which the # You should not need to change this. It is the base directory under which the
# manual pages will be installed. # manual pages will be installed.
@ -40,7 +20,7 @@ Index: Makefile
MACHINE := $(shell uname -m) MACHINE := $(shell uname -m)
@@ -218,7 +218,7 @@ ifeq ($(DEBUG),1) @@ -133,7 +133,7 @@ ifeq ($(DEBUG),1)
ALL_CPPFLAGS += -DDEBUG ALL_CPPFLAGS += -DDEBUG
ALL_CFLAGS += -O -g ALL_CFLAGS += -O -g
else else
@ -53,7 +33,7 @@ Index: prog/detect/sensors-detect
=================================================================== ===================================================================
--- prog/detect/sensors-detect.orig --- prog/detect/sensors-detect.orig
+++ prog/detect/sensors-detect +++ prog/detect/sensors-detect
@@ -5927,6 +5940,8 @@ EOT @@ -5945,6 +5945,8 @@ EOT
print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n". print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n".
"for initialization at boot time.\n" "for initialization at boot time.\n"
unless -f "/etc/init.d/lm_sensors"; unless -f "/etc/init.d/lm_sensors";

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

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

147
lm_sensors-drop-i2c-tools.dif
View File

@ -1,147 +0,0 @@
Index: Makefile
===================================================================
--- Makefile.orig
+++ Makefile
@@ -187,8 +187,11 @@ endif
endif
endif
SRCDIRS += kernel/include
-SRCDIRS += lib prog/detect prog/dump prog/eeprom prog/pwm \
- prog/sensors prog/xeon ${PROG_EXTRA:%=prog/%} etc
+SRCDIRS += lib prog/detect prog/pwm \
+ prog/sensors ${PROG_EXTRA:%=prog/%} etc
+ifneq (,$(findstring $(MACHINE), i386 i486 i586 i686 x86_64))
+SRCDIRS += prog/dump
+endif
SRCDIRS += lib/test
# Some often-used commands with default options
Index: prog/detect/Module.mk
===================================================================
--- prog/detect/Module.mk.orig
+++ prog/detect/Module.mk
@@ -22,14 +22,13 @@ MODULE_DIR := prog/detect
PROGDETECTDIR := $(MODULE_DIR)
PROGDETECTMAN8DIR := $(MANDIR)/man8
-PROGDETECTMAN8FILES := $(MODULE_DIR)/i2cdetect.8 $(MODULE_DIR)/sensors-detect.8
+PROGDETECTMAN8FILES := $(MODULE_DIR)/sensors-detect.8
# Regrettably, even 'simply expanded variables' will not put their currently
# defined value verbatim into the command-list of rules...
-PROGDETECTTARGETS := $(MODULE_DIR)/i2cdetect
-PROGDETECTSOURCES := $(MODULE_DIR)/i2cdetect.c
-PROGDETECTSBININSTALL := $(MODULE_DIR)/sensors-detect \
- $(MODULE_DIR)/i2cdetect
+PROGDETECTTARGETS :=
+PROGDETECTSOURCES :=
+PROGDETECTSBININSTALL := $(MODULE_DIR)/sensors-detect
# Include all dependency files. We use '.rd' to indicate this will create
# executables.
Index: prog/dump/Module.mk
===================================================================
--- prog/dump/Module.mk.orig
+++ prog/dump/Module.mk
@@ -22,18 +22,13 @@ MODULE_DIR := prog/dump
PROGDUMPDIR := $(MODULE_DIR)
PROGDUMPMAN8DIR := $(MANDIR)/man8
-PROGDUMPMAN8FILES := $(MODULE_DIR)/i2cdump.8 $(MODULE_DIR)/i2cset.8 \
- $(MODULE_DIR)/i2cget.8
+PROGDUMPMAN8FILES :=
# Regrettably, even 'simply expanded variables' will not put their currently
# defined value verbatim into the command-list of rules...
-PROGDUMPTARGETS := $(MODULE_DIR)/i2cdump $(MODULE_DIR)/i2cset \
- $(MODULE_DIR)/i2cget
-PROGDUMPSOURCES := $(MODULE_DIR)/i2cdump.c $(MODULE_DIR)/i2cset.c \
- $(MODULE_DIR)/i2cget.c $(MODULE_DIR)/i2cbusses.c \
- $(MODULE_DIR)/util.c
-PROGDUMPBININSTALL := $(MODULE_DIR)/i2cdump $(MODULE_DIR)/i2cset \
- $(MODULE_DIR)/i2cget
+PROGDUMPTARGETS :=
+PROGDUMPSOURCES :=
+PROGDUMPBININSTALL :=
# Only build isadump and isaset on x86 machines.
ifneq (,$(findstring $(MACHINE), i386 i486 i586 i686 x86_64))
Index: doc/progs
===================================================================
--- doc/progs.orig
+++ doc/progs
@@ -18,13 +18,6 @@ see http://www.lm-sensors.org/wiki/Usefu
* prog/daemon/healthd.sh (written in bash, not installed)
An example of a very simple hardware health monitoring daemon.
-* prog/detect/i2cdetect (written in C, installed by 'make install')
- This program scans your complete I2C or SMBus adapter for connected devices.
- Syntax:
- i2cdetect 0
- Here the '0' stands for the bus number (run "i2cdetect -l"
- to list all installed busses).
-
* prog/detect/sensors-detect (written in Perl, installed by 'make install')
This program tries to detect the available SMBus adapters and the chips
connected to them, as well as Super-I/O and misc chips. It also generates
@@ -43,40 +36,12 @@ see http://www.lm-sensors.org/wiki/Usefu
all module information and outputs insmod parameter information. Syntax:
./doc-insmod.pl DRIVER
-* prog/dump/i2cdump (written in C, installed by 'make install')
- This program dumps the registers of an I2C device.
- Usual syntax:
- i2cdump 0 0x4c b
- Here the '0' stands for the bus number (run i2cdump with no arguments
- to list all installed busses).
- '0x49' is the device address, and 'b' or 'w' stands for byte
- or word data.
-
-* prog/dump/i2cset (written in C, installed by 'make install')
- prog/dump/i2cget (written in C, installed by 'make install')
- These programs are used to write to or read from a register of an
- I2C device. Usual syntax:
- i2cset bus device address data
- i2cget bus device address
-
* prog/dump/isadump (written in C, installed by 'make install')
This program dumps the registers of ISA or Super-I/O chips.
Usual syntax:
isadump 0x295 0x296
isadump -k 0x55 0x2e 0x2f
-* prog/eeprom/decode-dimms.pl (perl script, installed by 'make install')
- This program decodes the information found in a memory module SPD EEPROM.
-
-* prog/eeprom/decode-vaio.pl (perl script, installed by 'make install')
- This program decodes the information in a Sony Vaio laptop
- identification eeprom at 0x57.
-
-* prog/eeprom/ddcmon (perl script, installed by 'make install')
- prog/eeprom/decode-edid.pl (perl script, installed by 'make install')
- These programs decode the information found in a display EEPROM. They
- require a bus driver for your video adapter, for DDC access to the display.
-
* prog/eepromer/eepromer (written in C, not installed)
This program reads and writes eeproms.
Danger: Do not use this to write your DRAM DIMM eeproms.
@@ -145,6 +110,3 @@ see http://www.lm-sensors.org/wiki/Usefu
* prog/tellerstats/gather.sh, tellerstats.sh (written in bash, not installed)
These scripts gather sensors data and graph the data for web pages.
See prog/tellerstats/README for more information.
-
-* prog/xeon/decode-xeon.pl (written in Perl, installed by 'make install')
- ID ROM data decoding for Xeon processors.
Index: kernel/include/Module.mk
===================================================================
--- kernel/include/Module.mk.orig
+++ kernel/include/Module.mk
@@ -22,7 +22,7 @@ MODULE_DIR := kernel/include
KERNELINCLUDEDIR := $(MODULE_DIR)
KERNELCHIPSDIR := kernel/chips
-KERNELINCLUDEFILES := $(MODULE_DIR)/i2c-dev.h $(MODULE_DIR)/sensors.h
+KERNELINCLUDEFILES := $(MODULE_DIR)/sensors.h
$(KERNELINCLUDEDIR)/sensors.h: $(KERNELINCLUDEDIR)/sensors.h.template
cat $@.template > $@

15
sensors.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Tue Nov 27 14:47:43 CET 2007 - jdelvare@suse.de
- Add a link to the init script.
-------------------------------------------------------------------
Mon Nov 26 13:34:08 CET 2007 - jdelvare@suse.de
- Update to lm_sensors version 3.0.0
* Completely rewritten library, much smaller
* Supports all devices supported by the kernel (contains no
device-specific code)
* libsensors has a new SONAME (libsensors.so.4)
* fancontrol.pl is gone
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 22 11:31:49 CET 2007 - jdelvare@suse.de Thu Nov 22 11:31:49 CET 2007 - jdelvare@suse.de

58
sensors.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package sensors (Version 2.10.5) # spec file for package sensors (Version 3.0.0)
# #
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine # This file and all modifications and additions to the pristine
@ -13,20 +13,17 @@
Name: sensors Name: sensors
BuildRequires: bison flex rrdtool-devel sysfsutils BuildRequires: bison flex rrdtool-devel sysfsutils
Url: http://www.lm-sensors.org/ Url: http://www.lm-sensors.org/
Version: 2.10.5 Version: 3.0.0
Release: 14 Release: 1
Summary: Hardware health monitoring for Linux Summary: Hardware health monitoring for Linux
License: GPL v2 or later License: GPL v2 or later
Group: System/Monitoring Group: System/Monitoring
Requires: modules /etc/sensors.conf Requires: modules /etc/sensors3.conf
AutoReqProv: on AutoReqProv: on
Source0: lm_sensors-2.10.5.tar.bz2 Source0: lm_sensors-3.0.0.tar.bz2
Source1: README.SuSE Patch: lm_sensors-3.0.0.dif
Patch: lm_sensors-2.10.5.dif Patch1: lm_sensors-3.0.0-sensord-separate.dif
Patch1: lm_sensors-drop-i2c-tools.dif Patch2: lm_sensors-3.0.0-sysconfig_metadata.patch
Patch2: lm_sensors-2.7.0-kernelheaders.dif
Patch3: lm_sensors-2.10.5-sensord-separate.dif
Patch4: lm_sensors-2.10.4-sysconfig_metadata.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExcludeArch: s390 s390x ExcludeArch: s390 s390x
@ -54,7 +51,7 @@ Authors:
%package -n sensord %package -n sensord
Summary: Hardware health monitoring daemon Summary: Hardware health monitoring daemon
Group: System/Monitoring Group: System/Monitoring
Requires: /etc/sensors.conf Requires: /etc/sensors3.conf
Provides: sensors:/usr/sbin/sensord Provides: sensors:/usr/sbin/sensord
AutoReqProv: on AutoReqProv: on
@ -71,12 +68,12 @@ Authors:
-------- --------
Merlin Hughes <merlin@merlin.org> Merlin Hughes <merlin@merlin.org>
%package -n libsensors3 %package -n libsensors4
Summary: Hardware health monitoring library Summary: Hardware health monitoring library
Group: System/Libraries Group: System/Libraries
AutoReqProv: on AutoReqProv: on
%description -n libsensors3 %description -n libsensors4
libsensors offers a way for applications to access the hardware libsensors offers a way for applications to access the hardware
monitoring chips of the system. A system-dependent configuration file monitoring chips of the system. A system-dependent configuration file
controls how the different inputs are labeled and what scaling factors controls how the different inputs are labeled and what scaling factors
@ -94,15 +91,15 @@ Authors:
Jean Delvare <khali@linux-fr.org> Jean Delvare <khali@linux-fr.org>
Mark M. Hoffman <mhoffman@lightlink.com> Mark M. Hoffman <mhoffman@lightlink.com>
%package -n libsensors3-devel %package -n libsensors4-devel
Summary: Hardware health monitoring library Summary: Hardware health monitoring library
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libsensors3 = %{version} Requires: libsensors4 = %{version}
Requires: sysfsutils Requires: sysfsutils
Provides: sensors:/usr/include/sensors/sensors.h Provides: sensors:/usr/include/sensors/sensors.h
AutoReqProv: on AutoReqProv: on
%description -n libsensors3-devel %description -n libsensors4-devel
libsensors offers a way for applications to access the hardware libsensors offers a way for applications to access the hardware
monitoring chips of the system. A system-dependent configuration file monitoring chips of the system. A system-dependent configuration file
controls how the different inputs are labeled and what scaling factors controls how the different inputs are labeled and what scaling factors
@ -125,8 +122,6 @@ Authors:
%patch %patch
%patch1 %patch1
%patch2 %patch2
%patch3
%patch4
%build %build
RPM_OPT_FLAGS="$RPM_OPT_FLAGS" RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
@ -145,28 +140,28 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
cp -a progs $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/ chmod -R u+rwX,g+rX,o+rX $RPM_BUILD_ROOT/%{_docdir}/sensors/
cd ../ cd ../
cp ${RPM_SOURCE_DIR}/README.SuSE $RPM_BUILD_ROOT/%{_docdir}/sensors/
chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/libsensors.so.* chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/libsensors.so.*
mkdir -p $RPM_BUILD_ROOT/etc/init.d mkdir -p $RPM_BUILD_ROOT/etc/init.d
install -m 0755 prog/init/lm_sensors.init.suse $RPM_BUILD_ROOT/etc/init.d/lm_sensors install -m 0755 prog/init/lm_sensors.init.suse $RPM_BUILD_ROOT/etc/init.d/lm_sensors
ln -sf /etc/init.d/lm_sensors $RPM_BUILD_ROOT/usr/sbin/rclm_sensors
# cleanup # cleanup
rm -f $RPM_BUILD_ROOT/usr/src/linux/include/sensors.h rm -f $RPM_BUILD_ROOT/usr/src/linux/include/sensors.h
%postun %postun
%{insserv_cleanup} %{insserv_cleanup}
%post -n libsensors3 %post -n libsensors4
%run_ldconfig %run_ldconfig
%postun -n libsensors3 %postun -n libsensors4
%run_ldconfig %run_ldconfig
%files %files
%defattr(-,root,root) %defattr(-,root,root)
/etc/init.d/lm_sensors /etc/init.d/lm_sensors
/usr/sbin/rclm_sensors
/usr/bin/* /usr/bin/*
/usr/sbin/fancontrol /usr/sbin/fancontrol
/usr/sbin/fancontrol.pl
%ifarch i386 i486 i586 i686 x86_64 %ifarch i386 i486 i586 i686 x86_64
/usr/sbin/isadump /usr/sbin/isadump
/usr/sbin/isaset /usr/sbin/isaset
@ -188,13 +183,13 @@ rm -f $RPM_BUILD_ROOT/usr/src/linux/include/sensors.h
/usr/sbin/sensord /usr/sbin/sensord
%doc /usr/share/man/man8/sensord.8.gz %doc /usr/share/man/man8/sensord.8.gz
%files -n libsensors3 %files -n libsensors4
%defattr(-,root,root) %defattr(-,root,root)
%config(noreplace) /etc/sensors.conf %config(noreplace) /etc/sensors3.conf
%{_libdir}/libsensors.so.3* %{_libdir}/libsensors.so.4*
%doc /usr/share/man/man5/*.5.gz %doc /usr/share/man/man5/*.5.gz
%files -n libsensors3-devel %files -n libsensors4-devel
%defattr(-,root,root) %defattr(-,root,root)
/usr/include/sensors/ /usr/include/sensors/
%{_libdir}/libsensors.a %{_libdir}/libsensors.a
@ -202,6 +197,15 @@ rm -f $RPM_BUILD_ROOT/usr/src/linux/include/sensors.h
%doc /usr/share/man/man3/*.3.gz %doc /usr/share/man/man3/*.3.gz
%changelog %changelog
* Tue Nov 27 2007 - jdelvare@suse.de
- Add a link to the init script.
* Mon Nov 26 2007 - jdelvare@suse.de
- Update to lm_sensors version 3.0.0
* Completely rewritten library, much smaller
* Supports all devices supported by the kernel (contains no
device-specific code)
* libsensors has a new SONAME (libsensors.so.4)
* fancontrol.pl is gone
* Thu Nov 22 2007 - jdelvare@suse.de * Thu Nov 22 2007 - jdelvare@suse.de
- Drop local changes to sensors-detect that are no longer relevant. - Drop local changes to sensors-detect that are no longer relevant.
- Drop local changes to sensord.init: we no longer package it. - Drop local changes to sensord.init: we no longer package it.