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:07:21 +0000 |
| commit | 739692ac066319d830d0eb7d27ef1075f259efe4 (patch) | |
| tree | acf844fbc03d937f7e008282fe83b29d27b844b3 | |
| parent | 9065a75d4a29b2528b5558d91bcd500ca51baa84 (diff) | |
| download | openembedded-core-739692ac066319d830d0eb7d27ef1075f259efe4.tar.gz openembedded-core-739692ac066319d830d0eb7d27ef1075f259efe4.tar.bz2 openembedded-core-739692ac066319d830d0eb7d27ef1075f259efe4.tar.xz openembedded-core-739692ac066319d830d0eb7d27ef1075f259efe4.zip | |
task-core-boot, keymaps: add another VIRTUAL-RUNTIME to allow distributions to use different set of initscripts or no initscripts at all
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta/recipes-bsp/keymaps/keymaps_1.0.bb | 6 | ||||
| -rw-r--r-- | meta/recipes-core/tasks/task-core-boot.bb | 6 |
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 23a3051b6..4fe7987b1 100644 --- a/meta/recipes-bsp/keymaps/keymaps_1.0.bb +++ b/meta/recipes-bsp/keymaps/keymaps_1.0.bb @@ -1,7 +1,11 @@ SUMMARY = "Keyboard maps" DESCRIPTION = "Keymaps and initscript to set the keymap on bootup." SECTION = "base" -RDEPENDS_${PN} = "initscripts console-tools" + +# Distro can override initscripts provider +VIRTUAL-RUNTIME_initscripts ?= "initscripts" + +RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_initscripts} console-tools" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta/recipes-core/tasks/task-core-boot.bb b/meta/recipes-core/tasks/task-core-boot.bb index 9e63ebb52..05c280dd1 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 PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS = "virtual/kernel" ALLOW_EMPTY = "1" -PR = "r8" +PR = "r9" # # Set by the machine configuration with packages essential for device bootup @@ -23,6 +23,8 @@ VIRTUAL-RUNTIME_dev_manager ?= "udev" 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" PACKAGES = "\ task-core-boot \ @@ -34,7 +36,7 @@ RDEPENDS_task-core-boot = "\ base-files \ base-passwd \ busybox \ - initscripts \ + ${VIRTUAL-RUNTIME_initscripts} \ ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \ modutils-initscripts \ netbase \ |