summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2011-12-20 23:58:22 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-03 12:14:28 +0000
commitb2266ed267eeba9e422d6845640855b5093b7657 (patch)
tree72276ff6b7322ae225e4ff3c80a03c2f0083aacb /meta/recipes-core
parent95ba9b7d3003dfa99a2b866979189d1075227868 (diff)
downloadpoky-b2266ed267eeba9e422d6845640855b5093b7657.tar.gz
task-core-boot: Allow DISTRO to disable keymaps via VIRTUAL-RUNTIME_keymaps
keymaps pulls in gettext, which can't build without wide character support. Rather than have to add a -tiny variant of every MACHINE to drop "keyboard" from the MACHINE_FEATURES, just enable the DISTRO to define what gets added to RDEPENDS_task-core-boot when MACHINE_FEATURES includes keyboard via the VIRTUAL-RUNTIME_keymaps variable. By default, keep "keymaps". (From OE-Core rev: 1db9313121cbc2db00843a4afcf5c26b5cb966ac) Signed-off-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/tasks/task-core-boot.bb8
1 files changed, 3 insertions, 5 deletions
diff --git a/meta/recipes-core/tasks/task-core-boot.bb b/meta/recipes-core/tasks/task-core-boot.bb
index 05c280dd13..6487436ccd 100644
--- a/meta/recipes-core/tasks/task-core-boot.bb
+++ b/meta/recipes-core/tasks/task-core-boot.bb
@@ -17,14 +17,12 @@ PR = "r9"
17MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" 17MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
18MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" 18MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
19 19
20# Distro can override dev_manager provider 20# Distro can override the following VIRTUAL-RUNTIME providers:
21VIRTUAL-RUNTIME_dev_manager ?= "udev" 21VIRTUAL-RUNTIME_dev_manager ?= "udev"
22# Distro can override login_manager provider
23VIRTUAL-RUNTIME_login_manager ?= "tinylogin" 22VIRTUAL-RUNTIME_login_manager ?= "tinylogin"
24# Distro can override init_manager provider
25VIRTUAL-RUNTIME_init_manager ?= "sysvinit" 23VIRTUAL-RUNTIME_init_manager ?= "sysvinit"
26# Distro can override initscripts provider
27VIRTUAL-RUNTIME_initscripts ?= "initscripts" 24VIRTUAL-RUNTIME_initscripts ?= "initscripts"
25VIRTUAL-RUNTIME_keymaps ?= "keymaps"
28 26
29PACKAGES = "\ 27PACKAGES = "\
30 task-core-boot \ 28 task-core-boot \
@@ -37,7 +35,7 @@ RDEPENDS_task-core-boot = "\
37 base-passwd \ 35 base-passwd \
38 busybox \ 36 busybox \
39 ${VIRTUAL-RUNTIME_initscripts} \ 37 ${VIRTUAL-RUNTIME_initscripts} \
40 ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \ 38 ${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \
41 modutils-initscripts \ 39 modutils-initscripts \
42 netbase \ 40 netbase \
43 ${VIRTUAL-RUNTIME_login_manager} \ 41 ${VIRTUAL-RUNTIME_login_manager} \