summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2012-01-13 10:56:47 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-17 14:53:02 +0000
commitafff4e6130e835048d81f65f703e118d5944629a (patch)
tree064321bb774781a6c532ec20399bd79e69ef97f6 /meta
parent3f6c29bc32722d4cef3a89aed749e2fbce44a080 (diff)
downloadopenembedded-core-afff4e6130e835048d81f65f703e118d5944629a.tar.gz
openembedded-core-afff4e6130e835048d81f65f703e118d5944629a.tar.bz2
openembedded-core-afff4e6130e835048d81f65f703e118d5944629a.zip
task-base: move default definition of VIRTUAL-RUNTIME_apm
This belongs in default-providers.conf Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/default-providers.inc1
-rw-r--r--meta/recipes-core/tasks/task-base.bb3
2 files changed, 1 insertions, 3 deletions
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index afea5e7c50..244504968a 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -15,6 +15,7 @@ PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel"
# Default virtual runtime providers
#
VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
+VIRTUAL-RUNTIME_apm ?= "apm"
#
# Default recipe providers
diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb
index e0960b5e0e..12e171aa87 100644
--- a/meta/recipes-core/tasks/task-base.bb
+++ b/meta/recipes-core/tasks/task-base.bb
@@ -162,9 +162,6 @@ RDEPENDS_task-base-acpi = "\
acpid \
libacpi "
-# Distro can override apm provider
-VIRTUAL-RUNTIME_apm ?= "apm"
-
RDEPENDS_task-base-apm = "\
${VIRTUAL-RUNTIME_apm} \
apmd"