From 2410065c8095710c8688e5cc2bb22aaf55390838 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 29 Dec 2010 21:33:14 +0100
Subject: [PATCH] acpid: remove package, add busybox's acpid applet

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/sysutils/acpid/build                   |  9 ---------
 packages/sysutils/acpid/config/power            |  2 --
 packages/sysutils/acpid/install                 | 17 -----------------
 packages/sysutils/acpid/meta                    | 16 ----------------
 packages/sysutils/busybox/config/busybox.conf   |  4 ++--
 .../sysutils/{acpid => busybox}/init.d/23_acpid |  2 +-
 packages/sysutils/busybox/install               |  4 ++++
 .../scripts/acpi_pwrbtn}                        |  0
 scripts/image                                   |  1 -
 9 files changed, 7 insertions(+), 48 deletions(-)
 delete mode 100755 packages/sysutils/acpid/build
 delete mode 100644 packages/sysutils/acpid/config/power
 delete mode 100755 packages/sysutils/acpid/install
 delete mode 100644 packages/sysutils/acpid/meta
 rename packages/sysutils/{acpid => busybox}/init.d/23_acpid (96%)
 rename packages/sysutils/{acpid/scripts/powerdown.sh => busybox/scripts/acpi_pwrbtn} (100%)

diff --git a/packages/sysutils/acpid/build b/packages/sysutils/acpid/build
deleted file mode 100755
index 56feb9c9b4..0000000000
--- a/packages/sysutils/acpid/build
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-. config/options $1
-
-LDFLAGS="$CFLAGS $LDFLAGS -fwhole-program"
-
-cd $PKG_BUILD
-
-make OPT="$CFLAGS"
diff --git a/packages/sysutils/acpid/config/power b/packages/sysutils/acpid/config/power
deleted file mode 100644
index 8b015a175c..0000000000
--- a/packages/sysutils/acpid/config/power
+++ /dev/null
@@ -1,2 +0,0 @@
-event=button/power.*
-action=/etc/acpi/actions/powerdown.sh
diff --git a/packages/sysutils/acpid/install b/packages/sysutils/acpid/install
deleted file mode 100755
index a1b4f6ff6a..0000000000
--- a/packages/sysutils/acpid/install
+++ /dev/null
@@ -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
diff --git a/packages/sysutils/acpid/meta b/packages/sysutils/acpid/meta
deleted file mode 100644
index 2da5636227..0000000000
--- a/packages/sysutils/acpid/meta
+++ /dev/null
@@ -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"
diff --git a/packages/sysutils/busybox/config/busybox.conf b/packages/sysutils/busybox/config/busybox.conf
index 129e660a5e..04f2ab686b 100644
--- a/packages/sysutils/busybox/config/busybox.conf
+++ b/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
diff --git a/packages/sysutils/acpid/init.d/23_acpid b/packages/sysutils/busybox/init.d/23_acpid
similarity index 96%
rename from packages/sysutils/acpid/init.d/23_acpid
rename to packages/sysutils/busybox/init.d/23_acpid
index 87142fb27d..612ba39a50 100755
--- a/packages/sysutils/acpid/init.d/23_acpid
+++ b/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"
diff --git a/packages/sysutils/busybox/install b/packages/sysutils/busybox/install
index e17026eefb..70570f9142 100755
--- a/packages/sysutils/busybox/install
+++ b/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
 
diff --git a/packages/sysutils/acpid/scripts/powerdown.sh b/packages/sysutils/busybox/scripts/acpi_pwrbtn
similarity index 100%
rename from packages/sysutils/acpid/scripts/powerdown.sh
rename to packages/sysutils/busybox/scripts/acpi_pwrbtn
diff --git a/scripts/image b/scripts/image
index ed7dca401f..df924f40cc 100755
--- a/scripts/image
+++ b/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