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>
This commit is contained in:
parent
95ba9b7d30
commit
b2266ed267
|
@ -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} \
|
||||
|
|
Loading…
Reference in New Issue