From b2266ed267eeba9e422d6845640855b5093b7657 Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Tue, 20 Dec 2011 23:58:22 -0800 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-core/tasks/task-core-boot.bb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'meta/recipes-core/tasks') 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} \ -- cgit v1.2.3-54-g00ecf