[arch-commits] Commit in lm_sensors/repos (14 files)
Antonio Rojas
arojas at archlinux.org
Fri Oct 28 19:24:05 UTC 2016
Date: Friday, October 28, 2016 @ 19:24:04
Author: arojas
Revision: 279417
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
lm_sensors/repos/staging-i686/
lm_sensors/repos/staging-i686/PKGBUILD
(from rev 279416, lm_sensors/trunk/PKGBUILD)
lm_sensors/repos/staging-i686/healthd
(from rev 279416, lm_sensors/trunk/healthd)
lm_sensors/repos/staging-i686/healthd.conf
(from rev 279416, lm_sensors/trunk/healthd.conf)
lm_sensors/repos/staging-i686/healthd.service
(from rev 279416, lm_sensors/trunk/healthd.service)
lm_sensors/repos/staging-i686/lm_sensors-fancontrol.patch
(from rev 279416, lm_sensors/trunk/lm_sensors-fancontrol.patch)
lm_sensors/repos/staging-i686/sensord.conf
(from rev 279416, lm_sensors/trunk/sensord.conf)
lm_sensors/repos/staging-x86_64/
lm_sensors/repos/staging-x86_64/PKGBUILD
(from rev 279416, lm_sensors/trunk/PKGBUILD)
lm_sensors/repos/staging-x86_64/healthd
(from rev 279416, lm_sensors/trunk/healthd)
lm_sensors/repos/staging-x86_64/healthd.conf
(from rev 279416, lm_sensors/trunk/healthd.conf)
lm_sensors/repos/staging-x86_64/healthd.service
(from rev 279416, lm_sensors/trunk/healthd.service)
lm_sensors/repos/staging-x86_64/lm_sensors-fancontrol.patch
(from rev 279416, lm_sensors/trunk/lm_sensors-fancontrol.patch)
lm_sensors/repos/staging-x86_64/sensord.conf
(from rev 279416, lm_sensors/trunk/sensord.conf)
--------------------------------------------+
staging-i686/PKGBUILD | 50 +++++++++++++++++++++++++
staging-i686/healthd | 53 +++++++++++++++++++++++++++
staging-i686/healthd.conf | 17 ++++++++
staging-i686/healthd.service | 9 ++++
staging-i686/lm_sensors-fancontrol.patch | 29 ++++++++++++++
staging-i686/sensord.conf | 9 ++++
staging-x86_64/PKGBUILD | 50 +++++++++++++++++++++++++
staging-x86_64/healthd | 53 +++++++++++++++++++++++++++
staging-x86_64/healthd.conf | 17 ++++++++
staging-x86_64/healthd.service | 9 ++++
staging-x86_64/lm_sensors-fancontrol.patch | 29 ++++++++++++++
staging-x86_64/sensord.conf | 9 ++++
12 files changed, 334 insertions(+)
Copied: lm_sensors/repos/staging-i686/PKGBUILD (from rev 279416, lm_sensors/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2016-10-28 19:24:04 UTC (rev 279417)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=lm_sensors
+pkgver=3.4.0
+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/"
+license=('GPL' 'LGPL')
+depends=('perl' 'sysfsutils')
+makedepends=('rrdtool')
+optdepends=('rrdtool: for logging with sensord')
+backup=('etc/sensors3.conf' 'etc/healthd.conf' 'etc/conf.d/sensord')
+source=($pkgname-$pkgver::https://github.com/groeck/lm-sensors/archive/V${pkgver//\./-}.tar.gz
+ healthd healthd.conf healthd.service sensord.conf
+ lm_sensors-fancontrol.patch)
+sha1sums=('4a9026e4db894c98ee7cea0bec1188108e415f71'
+ '1c91ae403d3cd02b6177ad1f1b2f2c3a7a3257f5'
+ '1edd4d72ade22adfc128fb8d670e85c633fd1d18'
+ 'd72ec328e9303acef86342483b6f8537de6117d9'
+ 'f4b5f21fdb3b2a55aa353afa1603f953b207b73b'
+ 'b0bc977348610d6a008d75a43f65800251c4c9f7')
+validpgpkeys=('7CA69F4460F1BDC41FD2C858A5526B9BB3CD4E6A')
+
+prepare() {
+ cd ${pkgname/_/-}-${pkgver//\./-}
+ sed -i 's|/etc/sysconfig|/etc/conf.d|' prog/{detect/sensors-detect,init/{sensord,lm_sensors}.service}
+ sed -i 's/EnvironmentFile=/EnvironmentFile=-/' prog/init/lm_sensors.service
+ patch -p0 -i "${srcdir}/lm_sensors-fancontrol.patch"
+}
+
+build() {
+ cd ${pkgname/_/-}-${pkgver//\./-}
+ make PREFIX=/usr
+}
+
+package() {
+ cd ${pkgname/_/-}-${pkgver//\./-}
+ make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \
+ PREFIX=/usr SBINDIR=/usr/bin MANDIR=/usr/share/man DESTDIR="${pkgdir}" install
+
+ install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/bin/healthd"
+
+ install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/healthd.conf"
+ install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord"
+
+ install -D -m644 "${srcdir}/healthd.service" "${pkgdir}/usr/lib/systemd/system/healthd.service"
+ install -D -m644 prog/init/*.service "${pkgdir}/usr/lib/systemd/system/"
+}
Copied: lm_sensors/repos/staging-i686/healthd (from rev 279416, lm_sensors/trunk/healthd)
===================================================================
--- staging-i686/healthd (rev 0)
+++ staging-i686/healthd 2016-10-28 19:24:04 UTC (rev 279417)
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+#
+# /usr/bin/healthd
+#
+
+. /etc/healthd.conf
+
+cmd="${ALARM_CMD}"
+addr="${ADMIN_EMAIL}"
+slp="${ALARM_SLEEP}"
+sensors="/usr/bin/sensors"
+
+
+while [ $# -gt 0 ] ; do
+ case "${1}" in
+ -c ) cmd="${2}" ; shift 2 ;;
+ -m ) addr="${2}" ; shift 2 ;;
+ -s ) slp="${2}" ; shift 2 ;;
+ * ) shift 1 ;;
+ esac
+done
+
+case "${ALARM_RESET}" in
+ yes) /usr/bin/sensors > /dev/null
+ ;;
+ no) true
+ ;;
+esac
+
+[ -n "${cmd}" ] && [ -n "$( which -- "${cmd%% *}" )" ] || \
+ [ -n "${addr}" ] || exit 1
+
+[ "${slp}" -ge 2 ] || slp=600
+
+while true ; do
+ sleep 15
+ message="$( $sensors )"
+ case "$message" in
+ '' ) message='Could not get any sensor values !' ;;
+ *ALARM* ) : ;;
+ * ) message='' ;;
+ esac
+ if [ -n "$message" ]; then
+ if [ -n "${addr}" ]; then
+ echo "$message" | mail -s \
+ "Sensors ALARM detected at host: $( hostname )" \
+ "${addr}"
+ fi
+ [ -z "${cmd}" ] || ${cmd} &
+ sleep ${slp}
+ fi
+done &
Copied: lm_sensors/repos/staging-i686/healthd.conf (from rev 279416, lm_sensors/trunk/healthd.conf)
===================================================================
--- staging-i686/healthd.conf (rev 0)
+++ staging-i686/healthd.conf 2016-10-28 19:24:04 UTC (rev 279417)
@@ -0,0 +1,17 @@
+#
+# /etc/healthd.conf
+#
+
+# reset any pending alarms on startup
+ALARM_RESET="yes"
+
+# where to sent mails on alarm
+ADMIN_EMAIL="root"
+
+# Seconds to sleep when alarm detected before checking again
+# If you want to fill up your mail inbox set this to 2. ;-)
+ALARM_SLEEP=600
+
+# command to run in background on each alarm
+# N.B.: If you choose to use the beep command, you'll need to install it: pacman -S beep
+ALARM_CMD="beep -f 800 -l 500 -d 500 -r 600"
Copied: lm_sensors/repos/staging-i686/healthd.service (from rev 279416, lm_sensors/trunk/healthd.service)
===================================================================
--- staging-i686/healthd.service (rev 0)
+++ staging-i686/healthd.service 2016-10-28 19:24:04 UTC (rev 279417)
@@ -0,0 +1,9 @@
+[Unit]
+Description=A daemon which can be used to alert you in the event of a hardware health monitoring alarm
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/healthd
+
+[Install]
+WantedBy=multi-user.target
Copied: lm_sensors/repos/staging-i686/lm_sensors-fancontrol.patch (from rev 279416, lm_sensors/trunk/lm_sensors-fancontrol.patch)
===================================================================
--- staging-i686/lm_sensors-fancontrol.patch (rev 0)
+++ staging-i686/lm_sensors-fancontrol.patch 2016-10-28 19:24:04 UTC (rev 279417)
@@ -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 [ "$DIR" != "/" ] && [ -z "$DEVPATH" -o -z "$DEVNAME" ]
++if [[ "$DIR" != "/" && ( -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
Copied: lm_sensors/repos/staging-i686/sensord.conf (from rev 279416, lm_sensors/trunk/sensord.conf)
===================================================================
--- staging-i686/sensord.conf (rev 0)
+++ staging-i686/sensord.conf 2016-10-28 19:24:04 UTC (rev 279417)
@@ -0,0 +1,9 @@
+#
+# /etc/conf.d/sensord
+#
+
+#Specify the interval between scanning for sensor alarms
+INTERVAL=60s
+
+#Specify the interval between logging all sensor readings
+LOG_INTERVAL=30m
Copied: lm_sensors/repos/staging-x86_64/PKGBUILD (from rev 279416, lm_sensors/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2016-10-28 19:24:04 UTC (rev 279417)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=lm_sensors
+pkgver=3.4.0
+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/"
+license=('GPL' 'LGPL')
+depends=('perl' 'sysfsutils')
+makedepends=('rrdtool')
+optdepends=('rrdtool: for logging with sensord')
+backup=('etc/sensors3.conf' 'etc/healthd.conf' 'etc/conf.d/sensord')
+source=($pkgname-$pkgver::https://github.com/groeck/lm-sensors/archive/V${pkgver//\./-}.tar.gz
+ healthd healthd.conf healthd.service sensord.conf
+ lm_sensors-fancontrol.patch)
+sha1sums=('4a9026e4db894c98ee7cea0bec1188108e415f71'
+ '1c91ae403d3cd02b6177ad1f1b2f2c3a7a3257f5'
+ '1edd4d72ade22adfc128fb8d670e85c633fd1d18'
+ 'd72ec328e9303acef86342483b6f8537de6117d9'
+ 'f4b5f21fdb3b2a55aa353afa1603f953b207b73b'
+ 'b0bc977348610d6a008d75a43f65800251c4c9f7')
+validpgpkeys=('7CA69F4460F1BDC41FD2C858A5526B9BB3CD4E6A')
+
+prepare() {
+ cd ${pkgname/_/-}-${pkgver//\./-}
+ sed -i 's|/etc/sysconfig|/etc/conf.d|' prog/{detect/sensors-detect,init/{sensord,lm_sensors}.service}
+ sed -i 's/EnvironmentFile=/EnvironmentFile=-/' prog/init/lm_sensors.service
+ patch -p0 -i "${srcdir}/lm_sensors-fancontrol.patch"
+}
+
+build() {
+ cd ${pkgname/_/-}-${pkgver//\./-}
+ make PREFIX=/usr
+}
+
+package() {
+ cd ${pkgname/_/-}-${pkgver//\./-}
+ make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \
+ PREFIX=/usr SBINDIR=/usr/bin MANDIR=/usr/share/man DESTDIR="${pkgdir}" install
+
+ install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/bin/healthd"
+
+ install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/healthd.conf"
+ install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord"
+
+ install -D -m644 "${srcdir}/healthd.service" "${pkgdir}/usr/lib/systemd/system/healthd.service"
+ install -D -m644 prog/init/*.service "${pkgdir}/usr/lib/systemd/system/"
+}
Copied: lm_sensors/repos/staging-x86_64/healthd (from rev 279416, lm_sensors/trunk/healthd)
===================================================================
--- staging-x86_64/healthd (rev 0)
+++ staging-x86_64/healthd 2016-10-28 19:24:04 UTC (rev 279417)
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+#
+# /usr/bin/healthd
+#
+
+. /etc/healthd.conf
+
+cmd="${ALARM_CMD}"
+addr="${ADMIN_EMAIL}"
+slp="${ALARM_SLEEP}"
+sensors="/usr/bin/sensors"
+
+
+while [ $# -gt 0 ] ; do
+ case "${1}" in
+ -c ) cmd="${2}" ; shift 2 ;;
+ -m ) addr="${2}" ; shift 2 ;;
+ -s ) slp="${2}" ; shift 2 ;;
+ * ) shift 1 ;;
+ esac
+done
+
+case "${ALARM_RESET}" in
+ yes) /usr/bin/sensors > /dev/null
+ ;;
+ no) true
+ ;;
+esac
+
+[ -n "${cmd}" ] && [ -n "$( which -- "${cmd%% *}" )" ] || \
+ [ -n "${addr}" ] || exit 1
+
+[ "${slp}" -ge 2 ] || slp=600
+
+while true ; do
+ sleep 15
+ message="$( $sensors )"
+ case "$message" in
+ '' ) message='Could not get any sensor values !' ;;
+ *ALARM* ) : ;;
+ * ) message='' ;;
+ esac
+ if [ -n "$message" ]; then
+ if [ -n "${addr}" ]; then
+ echo "$message" | mail -s \
+ "Sensors ALARM detected at host: $( hostname )" \
+ "${addr}"
+ fi
+ [ -z "${cmd}" ] || ${cmd} &
+ sleep ${slp}
+ fi
+done &
Copied: lm_sensors/repos/staging-x86_64/healthd.conf (from rev 279416, lm_sensors/trunk/healthd.conf)
===================================================================
--- staging-x86_64/healthd.conf (rev 0)
+++ staging-x86_64/healthd.conf 2016-10-28 19:24:04 UTC (rev 279417)
@@ -0,0 +1,17 @@
+#
+# /etc/healthd.conf
+#
+
+# reset any pending alarms on startup
+ALARM_RESET="yes"
+
+# where to sent mails on alarm
+ADMIN_EMAIL="root"
+
+# Seconds to sleep when alarm detected before checking again
+# If you want to fill up your mail inbox set this to 2. ;-)
+ALARM_SLEEP=600
+
+# command to run in background on each alarm
+# N.B.: If you choose to use the beep command, you'll need to install it: pacman -S beep
+ALARM_CMD="beep -f 800 -l 500 -d 500 -r 600"
Copied: lm_sensors/repos/staging-x86_64/healthd.service (from rev 279416, lm_sensors/trunk/healthd.service)
===================================================================
--- staging-x86_64/healthd.service (rev 0)
+++ staging-x86_64/healthd.service 2016-10-28 19:24:04 UTC (rev 279417)
@@ -0,0 +1,9 @@
+[Unit]
+Description=A daemon which can be used to alert you in the event of a hardware health monitoring alarm
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/healthd
+
+[Install]
+WantedBy=multi-user.target
Copied: lm_sensors/repos/staging-x86_64/lm_sensors-fancontrol.patch (from rev 279416, lm_sensors/trunk/lm_sensors-fancontrol.patch)
===================================================================
--- staging-x86_64/lm_sensors-fancontrol.patch (rev 0)
+++ staging-x86_64/lm_sensors-fancontrol.patch 2016-10-28 19:24:04 UTC (rev 279417)
@@ -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 [ "$DIR" != "/" ] && [ -z "$DEVPATH" -o -z "$DEVNAME" ]
++if [[ "$DIR" != "/" && ( -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
Copied: lm_sensors/repos/staging-x86_64/sensord.conf (from rev 279416, lm_sensors/trunk/sensord.conf)
===================================================================
--- staging-x86_64/sensord.conf (rev 0)
+++ staging-x86_64/sensord.conf 2016-10-28 19:24:04 UTC (rev 279417)
@@ -0,0 +1,9 @@
+#
+# /etc/conf.d/sensord
+#
+
+#Specify the interval between scanning for sensor alarms
+INTERVAL=60s
+
+#Specify the interval between logging all sensor readings
+LOG_INTERVAL=30m
More information about the arch-commits
mailing list