diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-10-29 09:37:20 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-10 12:08:58 +0000 |
commit | 06765229cc9b6456ee72eda30dc5429079e53a51 (patch) | |
tree | 2fdaaf487691241bd26a4eac5a663d8f7be0db05 /meta/recipes-core/tasks | |
parent | e6c97842bfea2565c2f42229d08e72d5484ca5cf (diff) | |
download | poky-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>
Diffstat (limited to 'meta/recipes-core/tasks')
-rw-r--r-- | meta/recipes-core/tasks/task-core-boot.bb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-core/tasks/task-core-boot.bb b/meta/recipes-core/tasks/task-core-boot.bb index 9e63ebb52c..05c280dd13 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 | |||
9 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 9 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
10 | DEPENDS = "virtual/kernel" | 10 | DEPENDS = "virtual/kernel" |
11 | ALLOW_EMPTY = "1" | 11 | ALLOW_EMPTY = "1" |
12 | PR = "r8" | 12 | PR = "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" | |||
23 | VIRTUAL-RUNTIME_login_manager ?= "tinylogin" | 23 | VIRTUAL-RUNTIME_login_manager ?= "tinylogin" |
24 | # Distro can override init_manager provider | 24 | # Distro can override init_manager provider |
25 | VIRTUAL-RUNTIME_init_manager ?= "sysvinit" | 25 | VIRTUAL-RUNTIME_init_manager ?= "sysvinit" |
26 | # Distro can override initscripts provider | ||
27 | VIRTUAL-RUNTIME_initscripts ?= "initscripts" | ||
26 | 28 | ||
27 | PACKAGES = "\ | 29 | PACKAGES = "\ |
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 \ |