summaryrefslogtreecommitdiff
path: root/recipes/tasks
diff options
context:
space:
mode:
authorSebastian Spaeth <Sebastian@SSpaeth.de>2009-12-04 08:30:46 +0100
committerSebastian Spaeth <Sebastian@SSpaeth.de>2009-12-04 08:30:46 +0100
commit80739fde7f5be56aae0b5981ce50cfe21ff94113 (patch)
tree1ef5fe05d94a26d13007d30bcff5d4c9a7ce12a1 /recipes/tasks
parent49d5f70658ab0386bee5869656d0405a6d416e35 (diff)
Revert Introduce DISTRO_apm patch until I get permission
* This was committed accidentally * This reverts commit 49d5f70658ab0386bee5869656d0405a6d416e35.
Diffstat (limited to 'recipes/tasks')
-rw-r--r--recipes/tasks/task-base.bb7
1 files changed, 2 insertions, 5 deletions
diff --git a/recipes/tasks/task-base.bb b/recipes/tasks/task-base.bb
index 6aad8730e2..ed561b802e 100644
--- a/recipes/tasks/task-base.bb
+++ b/recipes/tasks/task-base.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r87"
+PR = "r86"
inherit task
@@ -60,9 +60,6 @@ HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24", "linux-hotplug",""
#
DISTRO_SSH_DAEMON ?= "dropbear"
-# Distro can override apm provider
-DISTRO_apm ?= "apm"
-
#
# bluetooth manager
#
@@ -193,7 +190,7 @@ RDEPENDS_task-base-acpi = "\
acpid"
RDEPENDS_task-base-apm = "\
- "${DISTRO_apm}" \
+ apm \
apmd \
${@base_contains('MACHINE_FEATURES', 'kernel24', 'network-suspend-scripts', '',d)}"