acpid: remove package, add busybox's acpid applet

Signed-off-by: Stephan Raue <stephan@openelec.tv>

packages/sysutils/acpid/build

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-. config/options $1
-
-LDFLAGS="$CFLAGS $LDFLAGS -fwhole-program"
-
-cd $PKG_BUILD
-
-make OPT="$CFLAGS"

packages/sysutils/acpid/config/power

@@ -1,2 +0,0 @@
-event=button/power.*
-action=/etc/acpi/actions/powerdown.sh

packages/sysutils/acpid/install

@@ -1,17 +0,0 @@
-#!/bin/sh
-
-. config/options $1
-
-mkdir -p $INSTALL/usr/sbin
-  cp $PKG_BUILD/acpid $INSTALL/usr/sbin
-
-mkdir -p $INSTALL/etc/acpi/events
-  cp $PKG_DIR/config/power $INSTALL/etc/acpi/events
-
-mkdir -p $INSTALL/etc/acpi/actions
-  cp $PKG_DIR/scripts/powerdown.sh $INSTALL/etc/acpi/actions
-
-if [ "$DEVTOOLS" = yes ]; then
-  mkdir -p $INSTALL/usr/bin
-    cp $PKG_BUILD/acpi_listen $INSTALL/usr/bin
-fi

packages/sysutils/acpid/meta

@@ -1,16 +0,0 @@
-PKG_NAME="acpid"
-PKG_VERSION="2.0.7"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://acpid.sourceforge.net/"
-PKG_URL="http://www.tedfelix.com/linux/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="system"
-PKG_SHORTDESC="acpid: A daemon for delivering ACPI events"
-PKG_LONGDESC="ACPID is a completely flexible and expandable mechanism for delivering ACPI events from the kernel to user-space. It can be configured to perform any action at all when events occur, through regex matches and arbitrary action rules."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"

packages/sysutils/busybox/config/busybox.conf

@@ -508,8 +508,8 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 #
 # CONFIG_BLOCKDEV is not set
 # CONFIG_REV is not set
-# CONFIG_ACPID is not set
-# CONFIG_FEATURE_ACPID_COMPAT is not set
+CONFIG_ACPID=y
+CONFIG_FEATURE_ACPID_COMPAT=y
 # CONFIG_BLKID is not set
 CONFIG_DMESG=y
 CONFIG_FEATURE_DMESG_PRETTY=y

packages/sysutils/busybox/init.d/23_acpid

@@ -29,7 +29,7 @@
 (
   progress "Starting ACPI daemon"
 
-  acpid -l -n 2>&1 > /dev/null
+  acpid /dev/input/event* 2>&1 > /dev/null
 
   if [ -f /proc/acpi/wakeup ]; then
     progress "enable WakeUp devices"

packages/sysutils/busybox/install

@@ -24,6 +24,10 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $USER_PASSWORD`"
   mkdir -p $INSTALL/etc
     cp $PKG_DIR/config/profile $INSTALL/etc
 
+  # acpid specific
+    mkdir -p $INSTALL/etc/acpi/PWRF
+      cp $PKG_DIR/scripts/acpi_powerbtn $INSTALL/etc/acpi/PWRF/00000080
+
   # /etc/fstab is needed by...
     touch $INSTALL/etc/fstab
 

scripts/image

@@ -63,7 +63,6 @@ mkdir -p $INSTALL
   $SCRIPTS/install gcc-final
   $SCRIPTS/install linux system
   $SCRIPTS/install busybox
-  $SCRIPTS/install acpid
   $SCRIPTS/install util-linux-ng
 
 # Network support