[yocto] [PATCH 5/9] task-core-boot: Allow DISTRO to disable keymaps
Darren Hart
dvhart at linux.intel.com
Wed Dec 21 01:02:51 PST 2011
NOTE: I'm looking for a better way to do this.
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. By default,
keep "keymaps", but use DISTRO_KEYMAPS if it is set (to "" for example).
Signed-off-by: Darren Hart <dvhart at linux.intel.com>
---
meta/recipes-core/tasks/task-core-boot.bb | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/tasks/task-core-boot.bb b/meta/recipes-core/tasks/task-core-boot.bb
index 05c280d..e097836 100644
--- a/meta/recipes-core/tasks/task-core-boot.bb
+++ b/meta/recipes-core/tasks/task-core-boot.bb
@@ -17,6 +17,11 @@ PR = "r9"
MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
+#
+# Set by the distro configuration to empty if not supported
+#
+DISTRO_KEYMAPS ?= "keymaps"
+
# Distro can override dev_manager provider
VIRTUAL-RUNTIME_dev_manager ?= "udev"
# Distro can override login_manager provider
@@ -37,7 +42,7 @@ RDEPENDS_task-core-boot = "\
base-passwd \
busybox \
${VIRTUAL-RUNTIME_initscripts} \
- ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \
+ ${@base_contains("MACHINE_FEATURES", "keyboard", "${DISTRO_KEYMAPS}", "", d)} \
modutils-initscripts \
netbase \
${VIRTUAL-RUNTIME_login_manager} \
--
1.7.6.4
More information about the yocto
mailing list