diff options
| author | Darren Hart <dvhart@linux.intel.com> | 2011-12-20 23:58:22 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-03 12:10:45 +0000 |
| commit | 1db9313121cbc2db00843a4afcf5c26b5cb966ac (patch) | |
| tree | 267e27273adb63c3da6dcb895665f95227a94f0c | |
| parent | 8a76f80cabb8df5959707ee708f2c00b28a784e7 (diff) | |
| download | openembedded-core-1db9313121cbc2db00843a4afcf5c26b5cb966ac.tar.gz openembedded-core-1db9313121cbc2db00843a4afcf5c26b5cb966ac.tar.bz2 openembedded-core-1db9313121cbc2db00843a4afcf5c26b5cb966ac.zip | |
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".
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
| -rw-r--r-- | meta/recipes-core/tasks/task-core-boot.bb | 8 |
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" MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" -# Distro can override dev_manager provider +# Distro can override the following VIRTUAL-RUNTIME providers: VIRTUAL-RUNTIME_dev_manager ?= "udev" -# Distro can override login_manager provider VIRTUAL-RUNTIME_login_manager ?= "tinylogin" -# Distro can override init_manager provider VIRTUAL-RUNTIME_init_manager ?= "sysvinit" -# Distro can override initscripts provider VIRTUAL-RUNTIME_initscripts ?= "initscripts" +VIRTUAL-RUNTIME_keymaps ?= "keymaps" PACKAGES = "\ task-core-boot \ @@ -37,7 +35,7 @@ RDEPENDS_task-core-boot = "\ base-passwd \ busybox \ ${VIRTUAL-RUNTIME_initscripts} \ - ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \ modutils-initscripts \ netbase \ ${VIRTUAL-RUNTIME_login_manager} \ |