[Astlinux-commits] SF.net SVN: astlinux:[7385] branches/1.0

[<abe...@us...>]

Revision: 7385
          http://sourceforge.net/p/astlinux/code/7385
Author:   abelbeck
Date:     2015-12-08 15:07:11 +0000 (Tue, 08 Dec 2015)
Log Message:
-----------
acpid, version bump to 2.0.25, add K01acpid runlevel

Modified Paths:
--------------
    branches/1.0/package/acpid/acpid.init
    branches/1.0/package/acpid/acpid.mk

Removed Paths:
-------------
    branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S24acpid

Modified: branches/1.0/package/acpid/acpid.init
===================================================================
--- branches/1.0/package/acpid/acpid.init	2015-12-07 21:54:59 UTC (rev 7384)
+++ branches/1.0/package/acpid/acpid.init	2015-12-08 15:07:11 UTC (rev 7385)
@@ -10,7 +10,7 @@
 
 start () {
 
-  if [ -x /usr/sbin/acpid -a -f /proc/acpi/event ]; then
+  if [ -x /usr/sbin/acpid -a -e /proc/acpi/event ]; then
     echo "Starting acpid..."
 
     /usr/sbin/acpid -p $PIDFILE

Modified: branches/1.0/package/acpid/acpid.mk
===================================================================
--- branches/1.0/package/acpid/acpid.mk	2015-12-07 21:54:59 UTC (rev 7384)
+++ branches/1.0/package/acpid/acpid.mk	2015-12-08 15:07:11 UTC (rev 7385)
@@ -4,16 +4,26 @@
 #
 #############################################################
 
-ACPID_VERSION = 2.0.23
+ACPID_VERSION = 2.0.25
 ACPID_SOURCE = acpid-$(ACPID_VERSION).tar.xz
 ACPID_SITE = http://downloads.sourceforge.net/project/acpid2
 
-define ACPID_SET_EVENTS
+define ACPID_SET_EVENTS_FILES
 	mkdir -p $(TARGET_DIR)/etc/acpi/events
 	/bin/echo -e "event=button[ /]power\naction=/sbin/poweroff" > $(TARGET_DIR)/etc/acpi/events/powerbtn
 	$(INSTALL) -D -m 755 package/acpid/acpid.init $(TARGET_DIR)/etc/init.d/acpid
+	ln -sf ../../init.d/acpid $(TARGET_DIR)/etc/runlevels/default/S24acpid
+	ln -sf ../../init.d/acpid $(TARGET_DIR)/etc/runlevels/default/K01acpid
 endef
 
-ACPID_POST_INSTALL_TARGET_HOOKS += ACPID_SET_EVENTS
+ACPID_POST_INSTALL_TARGET_HOOKS += ACPID_SET_EVENTS_FILES
 
+define ACPID_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/sbin/acpid
+	rm -f $(TARGET_DIR)/usr/bin/acpi_listen
+	rm -f $(TARGET_DIR)/etc/init.d/acpid
+	rm -f $(TARGET_DIR)/etc/runlevels/default/S24acpid
+	rm -f $(TARGET_DIR)/etc/runlevels/default/K01acpid
+endef
+
 $(eval $(call AUTOTARGETS,package,acpid))

Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S24acpid
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S24acpid	2015-12-07 21:54:59 UTC (rev 7384)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S24acpid	2015-12-08 15:07:11 UTC (rev 7385)
@@ -1 +0,0 @@
-link ../../init.d/acpid
\ No newline at end of file

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