[arch-commits] Commit in lm_sensors/trunk (8 files)
Eric Bélanger
eric at nymeria.archlinux.org
Fri Mar 22 21:22:12 UTC 2013
Date: Friday, March 22, 2013 @ 22:22:12
Author: eric
Revision: 180541
upgpkg: lm_sensors 3.3.3-2
Fix fancontrol script (close FS#34187), Remove initscripts support, Remove patch used by initscripts daemon
Added:
lm_sensors/trunk/lm_sensors-fancontrol.patch
Modified:
lm_sensors/trunk/PKGBUILD
Deleted:
lm_sensors/trunk/daemonarg.patch
lm_sensors/trunk/fancontrol.rc
lm_sensors/trunk/healthd.rc
lm_sensors/trunk/sensord.conf
lm_sensors/trunk/sensord.rc
lm_sensors/trunk/sensors.rc
-----------------------------+
PKGBUILD | 30 +++-------
daemonarg.patch | 50 -----------------
fancontrol.rc | 35 ------------
healthd.rc | 36 ------------
lm_sensors-fancontrol.patch | 29 ++++++++++
sensord.conf | 4 -
sensord.rc | 37 -------------
sensors.rc | 119 ------------------------------------------
8 files changed, 38 insertions(+), 302 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-03-22 21:16:41 UTC (rev 180540)
+++ PKGBUILD 2013-03-22 21:22:12 UTC (rev 180541)
@@ -3,7 +3,7 @@
pkgname=lm_sensors
pkgver=3.3.3
-pkgrel=1
+pkgrel=2
pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring"
arch=('i686' 'x86_64')
url="http://www.lm-sensors.org/"
@@ -11,35 +11,28 @@
depends=('perl' 'sysfsutils')
makedepends=('rrdtool')
optdepends=('rrdtool: for logging with sensord')
-backup=('etc/sensors3.conf' 'etc/healthd.conf' 'etc/conf.d/sensord')
+backup=('etc/sensors3.conf' 'etc/healthd.conf')
options=('!emptydirs')
source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig} \
- sensors.rc fancontrol.rc healthd healthd.conf healthd.rc sensord.conf \
- sensord.rc fancontrol.service sensord.service healthd.service \
- daemonarg.patch linux_3.0.patch)
+ healthd healthd.conf fancontrol.service sensord.service healthd.service \
+ linux_3.0.patch lm_sensors-fancontrol.patch)
sha1sums=('b55c06f425993e42f13553f204066c446da36fd3'
'035a721f20e4ad568f4fdde2d7c25d906c192458'
- 'b2e664b9b87759991f02d0a1e8cac5e95098c0a5'
- 'a068ac0a3115a6191a487e11422506baa922b40a'
'afaad558d2ad4732aa53b69afa23ccf37bc67ab1'
'6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc'
- 'de5a46afc39a77ae8721246a0223baf21a2d4c9c'
- 'de8d4d65406815c389f8a04e2a8508a1ae6749c8'
- '72a60251d1d55a67307dab4105d9f3f01a080af4'
'7a4a4d1442aeeba0ba8aefb742a3ef187b593f4c'
'eff43b4882d25dae7dd0b33eb2e33b0836a5cc51'
'a7a20eb3c799d70287e6c7968a7ab42165925293'
- '34241388c4001bfb6e49b7e10da1217e29a258d6'
- '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c')
+ '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c'
+ 'd3e419b4019451fb039ae3d3b8e0ec55121b9f17')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- sed -i -e 's|/etc/sysconfig|/etc/conf.d|' \
- -e 's|/etc/init.d/lm_sensors|/etc/rc.d/sensors|' prog/{detect/sensors-detect,init/lm_sensors.service}
+ sed -i 's|/etc/sysconfig|/etc/conf.d|' prog/{detect/sensors-detect,init/lm_sensors.service}
sed -i 's@\(/bin/systemctl\|/lib/systemd/system\)@/usr\1 at g' prog/detect/sensors-detect
sed -i 's/EnvironmentFile=/EnvironmentFile=-/' prog/init/lm_sensors.service
- patch -p1 < ../daemonarg.patch
- patch -p0 < ../linux_3.0.patch
+ patch -p0 -i "${srcdir}/linux_3.0.patch"
+ patch -p0 -i "${srcdir}/lm_sensors-fancontrol.patch"
make PREFIX=/usr
}
@@ -48,13 +41,8 @@
make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \
PREFIX=/usr MANDIR=/usr/share/man DESTDIR="${pkgdir}" install
install -D -m644 prog/init/lm_sensors.service "${pkgdir}/usr/lib/systemd/system/lm_sensors.service"
- install -D -m755 "${srcdir}/sensors.rc" "${pkgdir}/etc/rc.d/sensors"
- install -D -m755 "${srcdir}/fancontrol.rc" "${pkgdir}/etc/rc.d/fancontrol"
install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/healthd"
- install -D -m755 "${srcdir}/healthd.rc" "${pkgdir}/etc/rc.d/healthd"
install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/healthd.conf"
- install -D -m755 "${srcdir}/sensord.rc" "${pkgdir}/etc/rc.d/sensord"
- install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord"
install -D -m644 "${srcdir}/fancontrol.service" "${pkgdir}/usr/lib/systemd/system/fancontrol.service"
install -D -m644 "${srcdir}/sensord.service" "${pkgdir}/usr/lib/systemd/system/sensord.service"
install -D -m644 "${srcdir}/healthd.service" "${pkgdir}/usr/lib/systemd/system/healthd.service"
Deleted: daemonarg.patch
===================================================================
--- daemonarg.patch 2013-03-22 21:16:41 UTC (rev 180540)
+++ daemonarg.patch 2013-03-22 21:22:12 UTC (rev 180541)
@@ -1,50 +0,0 @@
-diff -ru lm_sensors-3.1.2-1/prog/pwm/fancontrol lm_sensors-3.1.2-1_pyropeter/usr/sbin/fancontrol
---- lm_sensors-3.1.2-1/prog/pwm/fancontrol 2010-02-03 03:45:15.000000000 +0100
-+++ lm_sensors-3.1.2-1_pyropeter/prog/pwm/fancontrol 2010-03-07 01:37:09.000000000 +0100
-@@ -5,7 +5,9 @@
- #
- # Version 0.70
- #
--# Usage: fancontrol [CONFIGFILE]
-+# Usage: fancontrol [-D] [CONFIGFILE]
-+#
-+# (-D causes fancontrol to 'fork' to the background after some tests)
- #
- # Dependencies:
- # bash, egrep, sed, cut, sleep, readlink, lm_sensors :)
-@@ -43,6 +45,12 @@
- #DEBUG=1
- MAX=255
-
-+DAEMON=0
-+if [ "$1" = "-D" ]; then
-+ DAEMON=1
-+ shift
-+fi
-+
- declare -i pwmval
-
- function LoadConfig {
-@@ -303,7 +311,6 @@
- echo "File $PIDFILE exists, is fancontrol already running?"
- exit 1
- fi
--echo $$ > "$PIDFILE"
-
- # $1 = pwm file name
- function pwmdisable()
-@@ -475,6 +482,14 @@
- let fcvcount=$fcvcount+1
- done
-
-+if [ "$DAEMON" -gt 0 ]; then
-+ echo "Forking..."
-+ $0 $* &> /dev/null &
-+ exit 0
-+fi
-+
-+echo $$ > "$PIDFILE"
-+
- echo 'Starting automatic fan control...'
-
- # main loop calling the main function at specified intervals
Deleted: fancontrol.rc
===================================================================
--- fancontrol.rc 2013-03-22 21:16:41 UTC (rev 180540)
+++ fancontrol.rc 2013-03-22 21:22:12 UTC (rev 180541)
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID -x /usr/sbin/fancontrol)
-case "$1" in
- start)
- stat_busy "Starting fancontrol"
- [ -z "$PID" ] && /usr/sbin/fancontrol -D &>/dev/null
- if [ $? -gt 0 -o -n "$PID" ]; then
- stat_fail
- else
- add_daemon fancontrol
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping fancontrol"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon fancontrol
- stat_done
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Deleted: healthd.rc
===================================================================
--- healthd.rc 2013-03-22 21:16:41 UTC (rev 180540)
+++ healthd.rc 2013-03-22 21:22:12 UTC (rev 180541)
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -x -o %PPID /usr/sbin/healthd)
-case "${1}" in
- start)
- stat_busy "Starting Health Daemon"
- [ -z "${PID}" ] && /usr/sbin/healthd &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- echo "${PID}" > /var/run/healthd.pid
- add_daemon healthd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Health Daemon"
- [ ! -z "${PID}" ] && kill ${PID} &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon healthd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 2
- $0 start
- ;;
- *) echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Added: lm_sensors-fancontrol.patch
===================================================================
--- lm_sensors-fancontrol.patch (rev 0)
+++ lm_sensors-fancontrol.patch 2013-03-22 21:22:12 UTC (rev 180541)
@@ -0,0 +1,29 @@
+--- prog/pwm/fancontrol 2012-11-07 03:26:37.000000000 +0200
++++ prog/pwm/fancontrol 2013-03-22 18:15:00.566696011 +0200
+@@ -297,7 +297,7 @@
+ cd $DIR
+
+ # Check for configuration change
+-if [ -z "$DEVPATH" -o -z "$DEVNAME" ]
++if [ -z "$DEVPATH" ] || [ -z "$DEVNAME" ]
+ then
+ echo "Configuration is too old, please run pwmconfig again" >&2
+ exit 1
+@@ -337,7 +337,7 @@
+ # It didn't work, try pwmN_enable=1 pwmN=255
+ echo 1 > $ENABLE 2> /dev/null
+ echo $MAX > $1
+- if [ `cat $ENABLE` -eq 1 -a `cat $1` -ge 190 ]
++ if [ `cat $ENABLE` -eq 1 ] && [ `cat $1` -ge 190 ]
+ then
+ # Success
+ return 0
+@@ -469,7 +469,7 @@
+ else
+ # calculate the new value from temperature and settings
+ pwmval="(${tval}-${mint})*(${maxpwm}-${minso})/(${maxt}-${mint})+${minso}"
+- if [ $pwmpval -eq 0 -o $min_fanval -eq 0 ]
++ if [ $pwmpval -eq 0 ] || [ $min_fanval -eq 0 ]
+ then # if fan was stopped start it using a safe value
+ echo $minsa > $pwmo
+ # Sleep while still handling signals
Deleted: sensord.conf
===================================================================
--- sensord.conf 2013-03-22 21:16:41 UTC (rev 180540)
+++ sensord.conf 2013-03-22 21:22:12 UTC (rev 180541)
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to sensord
-#
-SENSORD_ARGS=""
Deleted: sensord.rc
===================================================================
--- sensord.rc 2013-03-22 21:16:41 UTC (rev 180540)
+++ sensord.rc 2013-03-22 21:22:12 UTC (rev 180541)
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/sensord
-
-PID=$(pidof -o %PPID /usr/sbin/sensord)
-case "$1" in
- start)
- stat_busy "Starting sensord"
- [ -z "$PID" ] && /usr/sbin/sensord ${SENSORD_ARGS}
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon sensord
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping sensord"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon sensord
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Deleted: sensors.rc
===================================================================
--- sensors.rc 2013-03-22 21:16:41 UTC (rev 180540)
+++ sensors.rc 2013-03-22 21:22:12 UTC (rev 180541)
@@ -1,119 +0,0 @@
-#!/bin/bash
-
-# description: sensors is used for monitoring motherboard sensor values.
-# config: /etc/conf.d/lm_sensors
-
-# See also the lm_sensors homepage at:
-# http://www2.lm-sensors.nu/~lm78/index.html
-
-# It uses a config file /etc/conf.d/lm_sensors that contains the modules to
-# be loaded/unloaded. That file is sourced into this one.
-
-# The format of that file a shell script that simply defines the modules
-# in order as normal shell variables with the special names:
-# MODULE_1, MODULE_2, MODULE_3, etc.
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PSENSORS=/usr/bin/sensors
-
-if $(grep -q sysfs /proc/mounts); then
- WITHSYS=1
-else
- WITHSYS=0
-fi
-
-if [ $WITHSYS == "0" ]; then
- # If sensors isn't supported by the kernel, try loading the module...
- [ -e /proc/sys/dev/sensors ] || /sbin/modprobe i2c-proc &>/dev/null
-
- # Don't bother if /proc/sensors still doesn't exist, kernel doesn't have support for sensors.
- if ! [ -e /proc/sys/dev/sensors ]; then
- echo "lm_sensors: kernel does not have sensors support"
- stat_fail
- fi
-
- # If sensors was not already running, unload the module...
- [ -e /var/run/daemons/sensors ] || /sbin/modprobe -r i2c-proc &>/dev/null
-fi
-
-if [ -e /etc/conf.d/lm_sensors ]; then
- CONFIG=/etc/conf.d/lm_sensors
-elif [ -e /etc/sysconfig/lm_sensors ]; then
- # Moving config to new Arch-specific location
- mv /etc/sysconfig/lm_sensors /etc/conf.d/lm_sensors
- CONFIG=/etc/conf.d/lm_sensors
-fi
-
-case "$1" in
- start)
- stat_busy "Starting Up Sensors"
-
- if [ -r "$CONFIG" ]; then
- . "$CONFIG"
- modules=$(grep \^MODULE_ $CONFIG | wc -l | tr -d ' ')
- i=0
- while [ $i -lt $modules ] ; do
- module=$(eval echo '$'MODULE_$i)
- # echo starting module __${module}__ #debug
- /sbin/modprobe $module &>/dev/null
- i=$(expr $i + 1)
- done
- fi
-
- $PSENSORS -s
-
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon sensors
- stat_done
- fi
- ;;
-
- stop)
- stat_busy "Shutting Down Sensors"
-
- if [ -r "$CONFIG" ]; then
- . "$CONFIG"
- modules=$(grep \^MODULE_ $CONFIG | wc -l | tr -d ' ')
- i=$(expr $modules - 1)
- while [ $i -ge 0 ] ; do
- module=$(eval echo '$'MODULE_$i)
- # echo stoping module __${module}__ #debug
- /sbin/modprobe -r $module &>/dev/null
- i=$(expr $i - 1)
- done
- fi
-
- if [ $WITHSYS == "0" ]; then
- /sbin/modprobe -r i2c-proc &>/dev/null
- fi
-
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon sensors
- stat_done
- fi
- ;;
-
- status)
- $PSENSORS
- ;;
-
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
-
- condrestart)
- [ -e /var/run/daemons/sensors ] && $0 restart || :
- ;;
-
- *)
- echo "Usage: $0 {start|stop|restart|status|condrestart}"
-esac
-exit 0
More information about the arch-commits
mailing list