summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-10-29 07:37:20 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-10 12:08:58 (GMT)
commit06765229cc9b6456ee72eda30dc5429079e53a51 (patch)
tree2fdaaf487691241bd26a4eac5a663d8f7be0db05
parente6c97842bfea2565c2f42229d08e72d5484ca5cf (diff)
downloadpoky-06765229cc9b6456ee72eda30dc5429079e53a51.tar.gz
task-core-boot, keymaps: add another VIRTUAL-RUNTIME to allow distributions to use different set of initscripts or no initscripts at all
(From OE-Core rev: 739692ac066319d830d0eb7d27ef1075f259efe4) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/keymaps/keymaps_1.0.bb6
-rw-r--r--meta/recipes-core/tasks/task-core-boot.bb6
2 files changed, 9 insertions, 3 deletions
diff --git a/meta/recipes-bsp/keymaps/keymaps_1.0.bb b/meta/recipes-bsp/keymaps/keymaps_1.0.bb
index 23a3051..4fe7987 100644
--- a/meta/recipes-bsp/keymaps/keymaps_1.0.bb
+++ b/meta/recipes-bsp/keymaps/keymaps_1.0.bb
@@ -1,7 +1,11 @@
1SUMMARY = "Keyboard maps" 1SUMMARY = "Keyboard maps"
2DESCRIPTION = "Keymaps and initscript to set the keymap on bootup." 2DESCRIPTION = "Keymaps and initscript to set the keymap on bootup."
3SECTION = "base" 3SECTION = "base"
4RDEPENDS_${PN} = "initscripts console-tools" 4
5# Distro can override initscripts provider
6VIRTUAL-RUNTIME_initscripts ?= "initscripts"
7
8RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_initscripts} console-tools"
5LICENSE = "GPLv2" 9LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 10LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
7PACKAGE_ARCH = "${MACHINE_ARCH}" 11PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta/recipes-core/tasks/task-core-boot.bb b/meta/recipes-core/tasks/task-core-boot.bb
index 9e63ebb..05c280d 100644
--- a/meta/recipes-core/tasks/task-core-boot.bb
+++ b/meta/recipes-core/tasks/task-core-boot.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
9PACKAGE_ARCH = "${MACHINE_ARCH}" 9PACKAGE_ARCH = "${MACHINE_ARCH}"
10DEPENDS = "virtual/kernel" 10DEPENDS = "virtual/kernel"
11ALLOW_EMPTY = "1" 11ALLOW_EMPTY = "1"
12PR = "r8" 12PR = "r9"
13 13
14# 14#
15# Set by the machine configuration with packages essential for device bootup 15# Set by the machine configuration with packages essential for device bootup
@@ -23,6 +23,8 @@ VIRTUAL-RUNTIME_dev_manager ?= "udev"
23VIRTUAL-RUNTIME_login_manager ?= "tinylogin" 23VIRTUAL-RUNTIME_login_manager ?= "tinylogin"
24# Distro can override init_manager provider 24# Distro can override init_manager provider
25VIRTUAL-RUNTIME_init_manager ?= "sysvinit" 25VIRTUAL-RUNTIME_init_manager ?= "sysvinit"
26# Distro can override initscripts provider
27VIRTUAL-RUNTIME_initscripts ?= "initscripts"
26 28
27PACKAGES = "\ 29PACKAGES = "\
28 task-core-boot \ 30 task-core-boot \
@@ -34,7 +36,7 @@ RDEPENDS_task-core-boot = "\
34 base-files \ 36 base-files \
35 base-passwd \ 37 base-passwd \
36 busybox \ 38 busybox \
37 initscripts \ 39 ${VIRTUAL-RUNTIME_initscripts} \
38 ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \ 40 ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \
39 modutils-initscripts \ 41 modutils-initscripts \
40 netbase \ 42 netbase \