summaryrefslogtreecommitdiffstats
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:24 +0000
commit79b6192d21bc553603a6f94f5e0bbaf55f22c2c4 (patch)
treec4554b0e53e0e0089987e502d93c4371728a8cd9
parentf07793dd77c5ea0d91fa420a986c52a06fdb34f6 (diff)
downloadpoky-79b6192d21bc553603a6f94f5e0bbaf55f22c2c4.tar.gz
task-base: move default definition of VIRTUAL-RUNTIME_apm
This belongs in default-providers.conf (From OE-Core rev: afff4e6130e835048d81f65f703e118d5944629a) Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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"
15# Default virtual runtime providers 15# Default virtual runtime providers
16# 16#
17VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth" 17VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
18VIRTUAL-RUNTIME_apm ?= "apm"
18 19
19# 20#
20# Default recipe providers 21# 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 = "\
162 acpid \ 162 acpid \
163 libacpi " 163 libacpi "
164 164
165# Distro can override apm provider
166VIRTUAL-RUNTIME_apm ?= "apm"
167
168RDEPENDS_task-base-apm = "\ 165RDEPENDS_task-base-apm = "\
169 ${VIRTUAL-RUNTIME_apm} \ 166 ${VIRTUAL-RUNTIME_apm} \
170 apmd" 167 apmd"