[Astlinux-commits] SF.net SVN: astlinux: [456] trunk

[<kr...@us...>]

Revision: 456
          http://svn.sourceforge.net/astlinux/?rev=456&view=rev
Author:   krisk84
Date:     2006-11-10 12:02:27 -0800 (Fri, 10 Nov 2006)

Log Message:
-----------
more apcupsd fixes

Modified Paths:
--------------
    trunk/package/apcupsd/apcupsd.mk

Added Paths:
-----------
    trunk/package/apcupsd/apcupsd.init
    trunk/target/generic/target_skeleton/etc/runlevels/default/K23apcupsd
    trunk/target/generic/target_skeleton/etc/runlevels/default/S35apcupsd

Added: trunk/package/apcupsd/apcupsd.init
===================================================================
--- trunk/package/apcupsd/apcupsd.init	                        (rev 0)
+++ trunk/package/apcupsd/apcupsd.init	2006-11-10 20:02:27 UTC (rev 456)
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+init () {
+if [ "$UPSTYPE" -a "$UPSCABLE" ]
+then
+
+if [ "$UPSDEVICE" ]
+then
+UDEV="$UPSDEVICE"
+else
+UDEV=""
+mount -t usbfs none /proc/bus/usb
+mkdir -p /dev/usb/hid
+mknod /dev/usb/hid/hiddev0 c 180 96
+mknod /dev/usb/hid/hiddev1 c 180 97
+mknod /dev/usb/hid/hiddev2 c 180 98
+mknod /dev/usb/hid/hiddev3 c 180 99
+mknod /dev/usb/hid/hiddev4 c 180 100
+mknod /dev/usb/hid/hiddev5 c 180 101
+mknod /dev/usb/hid/hiddev6 c 180 102
+mknod /dev/usb/hid/hiddev7 c 180 103
+mknod /dev/usb/hid/hiddev8 c 180 104
+mknod /dev/usb/hid/hiddev9 c 180 105
+mknod /dev/usb/hid/hiddev10 c 180 106
+mknod /dev/usb/hid/hiddev11 c 180 107
+mknod /dev/usb/hid/hiddev12 c 180 108
+mknod /dev/usb/hid/hiddev13 c 180 109
+mknod /dev/usb/hid/hiddev14 c 180 110
+mknod /dev/usb/hid/hiddev15 c 180 111
+fi
+
+echo "UPSNAME $HOSTNAME-ups
+UPSCABLE $UPSCABLE
+UPSTYPE $UPSTYPE
+DEVICE $UDEV
+
+LOCKFILE /var/lock
+ONBATTERYDELAY 6
+BATTERYLEVEL 5
+MINUTES 3
+TIMEOUT 0
+ANNOY 300
+NOLOGON disable
+KILLDELAY 0
+NETSERVER off
+NISIP 0.0.0.0
+NISPORT 3551
+EVENTSFILE /var/log/apcupsd.events
+EVENTSFILEMAX 10
+UPSCLASS standalone
+UPSMODE disable
+STATTIME 0
+STATFILE /var/log/apcupsd.status
+LOGSTATS off
+DATATIME 0" > /tmp/etc/apcupsd.conf
+fi
+}
+
+start () {
+if [ -r /etc/apcupsd.conf ]
+then
+echo "Starting apcupsd..."
+/usr/sbin/apcupsd
+fi
+}
+
+stop () {
+if `ps | grep -q apcupsd`
+then
+echo "Stopping apcupsd..."
+killall apcupsd 2> /dev/null
+fi
+}
+
+case $1 in
+
+start)
+start
+;;
+
+stop)
+stop
+;;
+
+init)
+init
+start
+;;
+
+restart)
+stop
+sleep 2
+start
+;;
+
+*)
+echo "Usage: start|stop|restart"
+;;
+
+esac


Property changes on: trunk/package/apcupsd/apcupsd.init
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/package/apcupsd/apcupsd.mk
===================================================================
--- trunk/package/apcupsd/apcupsd.mk	2006-11-10 19:38:53 UTC (rev 455)
+++ trunk/package/apcupsd/apcupsd.mk	2006-11-10 20:02:27 UTC (rev 456)
@@ -10,18 +10,15 @@
 APCUPSD_BINARY:=apcupsd
 APCUPSD_TARGET_BINARY:=usr/sbin/apcupsd
 
-
 $(DL_DIR)/$(APCUPSD_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(APCUPSD_SITE)/$(APCUPSD_SOURCE)
 
-
 apcupsd-source: $(DL_DIR)/$(APCUPSD_SOURCE)
 
 $(APCUPSD_DIR)/.source: $(DL_DIR)/$(APCUPSD_SOURCE) $(DL_DIR)/$(APCUPSD_PATCH)
 	zcat $(DL_DIR)/$(APCUPSD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	touch $(APCUPSD_DIR)/.source
 
-
 $(APCUPSD_DIR)/.configured: $(APCUPSD_DIR)/.source
 	(cd $(APCUPSD_DIR); \
 	$(TARGET_CONFIGURE_OPTS) \
@@ -42,14 +39,16 @@
 	$(MAKE1) CC=$(TARGET_CC) -C $(APCUPSD_DIR)
 
 $(TARGET_DIR)/$(APCUPSD_TARGET_BINARY): $(APCUPSD_DIR)/$(APCUPSD_BINARY)
-	# $(MAKE) prefix=$(TARGET_DIR)/usr -C $(APCUPSD_DIR) install
-	# cp $(APCUPSD_DIR)/samples/apcupsd.conf  $(TARGET_DIR)/etc/apcupsd.conf
-	rm -Rf $(TARGET_DIR)/usr/man
+	$(MAKE1) -C $(APCUPSD_DIR) install
+	$(INSTALL -D -m 0755 package/apcupsd/apcupsd.init $(TARGET_DIR)/etc/init.d/apcupsd
+	ln -sf /tmp/etc/apcupsd.conf $(TARGET_DIR)/etc/apcupsd.conf
+	$(INSTALL) -D -m 0755 $(STAGING_DIR)/$(APCUPSD_TARGET_BINARY) $(TARGET_DIR)/$(APCUPSD_TARGET_BINARY)
+	$(STRIP) $(TARGET_DIR)/$(APCUPSD_TARGET_BINARY)
 
-apcupsd: uclibc $(TARGET_DIR)/$(APCUPSD_TARGET_BINARY)
+apcupsd: uclibc libusb $(TARGET_DIR)/$(APCUPSD_TARGET_BINARY)
 
 apcupsd-clean:
-	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(APCUPSD_DIR) uninstall
+	$(MAKE) -C $(APCUPSD_DIR) uninstall
 	-$(MAKE) -C $(APCUPSD_DIR) clean
 
 apcupsd-dirclean:

Added: trunk/target/generic/target_skeleton/etc/runlevels/default/K23apcupsd
===================================================================
--- trunk/target/generic/target_skeleton/etc/runlevels/default/K23apcupsd	                        (rev 0)
+++ trunk/target/generic/target_skeleton/etc/runlevels/default/K23apcupsd	2006-11-10 20:02:27 UTC (rev 456)
@@ -0,0 +1 @@
+link ../../init.d/apcupsd
\ No newline at end of file


Property changes on: trunk/target/generic/target_skeleton/etc/runlevels/default/K23apcupsd
___________________________________________________________________
Name: svn:special
   + *

Added: trunk/target/generic/target_skeleton/etc/runlevels/default/S35apcupsd
===================================================================
--- trunk/target/generic/target_skeleton/etc/runlevels/default/S35apcupsd	                        (rev 0)
+++ trunk/target/generic/target_skeleton/etc/runlevels/default/S35apcupsd	2006-11-10 20:02:27 UTC (rev 456)
@@ -0,0 +1 @@
+link ../../init.d/apcupsd
\ No newline at end of file


Property changes on: trunk/target/generic/target_skeleton/etc/runlevels/default/S35apcupsd
___________________________________________________________________
Name: svn:special
   + *


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.