lm_sensors update remove systemd files.

2015-10-02 09:59:44 +03:00
parent d231e09d9d
commit b5fd5e7df3
4 changed files with 49 additions and 13 deletions
@@ -9,17 +9,9 @@ from pisi.actionsapi import pisitools
 from pisi.actionsapi import get

 def build():
-    autotools.make("CC=%s LIBDIR=/usr/lib EXLDFLAGS= PROG_EXTRA=sensord user" % get.CC())
+    autotools.make("PREFIX=/usr")

 def install():
-    autotools.rawInstall("PREFIX=/usr MANDIR=/%s PROG_EXTRA=sensord DESTDIR=%s user_install" % (get.manDIR(), get.installDIR()))
-
-    # Drop static lib
-    pisitools.remove("/usr/lib/libsensors.a")
-
-    pisitools.dodir("/etc/sensors.d")
-
-    # Install systemd service
-    pisitools.insinto("/lib/systemd/system", "prog/init/lm_sensors.service")
+    autotools.rawInstall("PREFIX=/usr BUILD_STATIC_LIB=0 MANDIR=/%s PROG_EXTRA=sensord DESTDIR=%s user_install" % (get.manDIR(), get.installDIR()))

    pisitools.dodoc("CHANGES", "CONTRIBUTORS", "README")
@@ -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
@@ -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
@@ -13,12 +13,12 @@
        <IsA>library</IsA>
        <Summary>Hardware monitoring tools</Summary>
        <Description>lm_sensors provides essential tools for monitoring the temperatures, voltages, and fans of Linux systems with hardware monitoring devices. It also contains scripts for sensor hardware identification and fan speed control.</Description>
-        <Archive sha1sum="179989a52bae8f01ba8ed77e8a15af6ec653d89e" type="tarbz2">http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-3.3.5.tar.bz2</Archive>
+        <Archive sha1sum="3e245b61a69756ea94f9c8a7c7614ec543970b8c" type="tarbz2">http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-3.4.0.tar.bz2</Archive>
        <BuildDependencies>
            <Dependency>rrdtool-devel</Dependency>
        </BuildDependencies>
        <Patches>
-             <Patch>lm_sensors-3.3.5-upstream_fixes-1.patch</Patch>
+             <Patch>lm_sensors-fancontrol.patch</Patch>
        </Patches>
    </Source>

@@ -35,7 +35,6 @@
            <Path fileType="library">/usr/lib</Path>
            <Path fileType="man">/usr/share/man</Path>
            <Path fileType="doc">/usr/share/doc</Path>
-            <Path fileType="data">/lib/systemd/system</Path>
        </Files>
    </Package>

@@ -53,6 +52,13 @@
    </Package>

    <History>
+        <Update release="3">
+            <Date>2015-10-02</Date>
+            <Version>3.4.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
        <Update release="2">
            <Date>2014-04-14</Date>
            <Version>3.3.5</Version>