[Astlinux-commits] SF.net SVN: astlinux: [196] branches/dhartman/package/ntp

[<dha...@us...>]

Revision: 196
Author:   dhartman
Date:     2006-08-06 18:23:35 -0700 (Sun, 06 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/astlinux/?rev=196&view=rev

Log Message:
-----------
add acpi-button support and acpid init script.  Changes to make rc.conf and /etc/asterisk a sym link to /mnt/kd/ if available

Modified Paths:
--------------
    branches/dhartman/package/acpid/acpid.mk
    branches/dhartman/package/ntp/ntp.mk
    branches/dhartman/package/vsftpd/vsftpd.init
    branches/dhartman/target/device/geni586/linux-geni586-wlan-2.6.16.12.config
    branches/dhartman/target/generic/target_skeleton/etc/rc
Modified: branches/dhartman/package/acpid/acpid.mk
===================================================================
--- branches/dhartman/package/acpid/acpid.mk	2006-08-03 07:15:17 UTC (rev 195)
+++ branches/dhartman/package/acpid/acpid.mk	2006-08-07 01:23:35 UTC (rev 196)
@@ -26,6 +26,7 @@
 	mkdir -p $(TARGET_DIR)/etc/acpi/events
 	echo -e "event=button[ /]power\naction=/sbin/poweroff" > $(TARGET_DIR)/etc/acpi/events/powerbtn
 	touch -c $(TARGET_DIR)/usr/sbin/acpid
+	$(INSTALL) -D -m 0755 package/acpid/acpid.init $(TARGET_DIR)/etc/init.d/acpid
 
 acpid: $(TARGET_DIR)/usr/sbin/acpid
 
@@ -33,6 +34,9 @@
 
 acpid-clean:
 	-make -C $(ACPID_DIR) clean
+	rm -f $(TARGET_DIR)/usr/sbin/acpid
+	rm -f $(TARGET_DIR)/etc/init.d/acpid
+	rm -rf $(TARGET_DIR)/etc/acpi
 
 acpid-dirclean:
 	rm -rf $(ACPID_DIR)

Modified: branches/dhartman/package/ntp/ntp.mk
===================================================================
--- branches/dhartman/package/ntp/ntp.mk	2006-08-03 07:15:17 UTC (rev 195)
+++ branches/dhartman/package/ntp/ntp.mk	2006-08-07 01:23:35 UTC (rev 196)
@@ -5,7 +5,7 @@
 #############################################################
 NTP_VERSION:=4.2.0
 NTP_SOURCE:=ntp-$(NTP_VERSION).tar.gz
-NTP_SITE:=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4
+NTP_SITE:=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2
 NTP_DIR:=$(BUILD_DIR)/ntp-$(NTP_VERSION)
 NTP_CAT:=zcat
 NTP_BINARY:=ntpdate/ntpdate

Modified: branches/dhartman/package/vsftpd/vsftpd.init
===================================================================
--- branches/dhartman/package/vsftpd/vsftpd.init	2006-08-03 07:15:17 UTC (rev 195)
+++ branches/dhartman/package/vsftpd/vsftpd.init	2006-08-07 01:23:35 UTC (rev 196)
@@ -47,10 +47,10 @@
 FTPDOPTIONS="$FTPDOPTIONS"
 else
 FTPDOPTIONS="/etc/vsftpd.conf"
+fi
 echo "Starting vsftpd..."
 vsftpd "$FTPDOPTIONS"
 fi
-fi
 }
 
 stop () {

Modified: branches/dhartman/target/device/geni586/linux-geni586-wlan-2.6.16.12.config
===================================================================
--- branches/dhartman/target/device/geni586/linux-geni586-wlan-2.6.16.12.config	2006-08-03 07:15:17 UTC (rev 195)
+++ branches/dhartman/target/device/geni586/linux-geni586-wlan-2.6.16.12.config	2006-08-07 01:23:35 UTC (rev 196)
@@ -216,7 +216,7 @@
 CONFIG_ACPI=y
 # CONFIG_ACPI_AC is not set
 # CONFIG_ACPI_BATTERY is not set
-# CONFIG_ACPI_BUTTON is not set
+CONFIG_ACPI_BUTTON=yes 
 # CONFIG_ACPI_VIDEO is not set
 # CONFIG_ACPI_HOTKEY is not set
 # CONFIG_ACPI_FAN is not set

Modified: branches/dhartman/target/generic/target_skeleton/etc/rc
===================================================================
--- branches/dhartman/target/generic/target_skeleton/etc/rc	2006-08-03 07:15:17 UTC (rev 195)
+++ branches/dhartman/target/generic/target_skeleton/etc/rc	2006-08-07 01:23:35 UTC (rev 196)
@@ -238,7 +238,7 @@
 
 if [ -f /mnt/kd/rc.conf ]
 then
-cp -a /mnt/kd/rc.conf /tmp/etc/rc.conf
+ln -s /mnt/kd/rc.conf /tmp/etc/rc.conf
 else
 cp -a /stat/etc/rc.conf /tmp/etc/rc.conf
 fi
@@ -252,7 +252,7 @@
 if [ -d /mnt/kd/rc.conf.d ]
 then
 mkdir -p /tmp/etc/rc.conf.d
-cp -a /mnt/kd/rc.conf.d/*.conf /tmp/etc/rc.conf.d/
+ln -s /mnt/kd/rc.conf.d/*.conf /tmp/etc/rc.conf.d/
 fi
 
 if [ -d /tmp/etc/rc.conf.d ]


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