diff options
| author | Radu Moisan <radu.moisan@intel.com> | 2013-01-19 22:47:04 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-20 12:44:26 +0000 |
| commit | f8fb9675cf79b783ad610a1eff48f41310734056 (patch) | |
| tree | a31d48bbf79fdad93c32b1164c45148c90aad671 | |
| parent | 349e5bea53b02cabf836b8943541a002ce9ba682 (diff) | |
| download | poky-f8fb9675cf79b783ad610a1eff48f41310734056.tar.gz | |
default-distrovars: Add DISTRO_FEATURES_INITMAN to DISTRO_FEATURES
This is a more generic way to set the init manager since we
plan to support other init managers as well.
I will use this variable as a switch to turn on/off any
init scheme that we might support in the future.
By default we use sysvinit.
(From OE-Core rev: 87f06346728bda000c0c0f95312b6a0a1b149ab4)
Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/conf/distro/include/default-distrovars.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-core/packagegroups/packagegroup-core-boot.bb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index 9002fd6f43..f07354771a 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc | |||
| @@ -19,7 +19,8 @@ DISTRO_FEATURES_LIBC_DEFAULT ?= "ipv4 ipv6 libc-backtrace libc-big-macros libc-b | |||
| 19 | libc-posix-wchar-io" | 19 | libc-posix-wchar-io" |
| 20 | DISTRO_FEATURES_LIBC ?= "${DISTRO_FEATURES_LIBC_DEFAULT}" | 20 | DISTRO_FEATURES_LIBC ?= "${DISTRO_FEATURES_LIBC_DEFAULT}" |
| 21 | DISTRO_FEATURES_LIBC_class-nativesdk = "${DISTRO_FEATURES_LIBC_DEFAULT}" | 21 | DISTRO_FEATURES_LIBC_class-nativesdk = "${DISTRO_FEATURES_LIBC_DEFAULT}" |
| 22 | DISTRO_FEATURES ?= "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g x11 ${DISTRO_FEATURES_LIBC}" | 22 | DISTRO_FEATURES_INITMAN ?= "sysvinit" |
| 23 | DISTRO_FEATURES ?= "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g x11 ${DISTRO_FEATURES_LIBC} ${DISTRO_FEATURES_INITMAN}" | ||
| 23 | 24 | ||
| 24 | IMAGE_FEATURES ?= "" | 25 | IMAGE_FEATURES ?= "" |
| 25 | 26 | ||
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb index 16ad4e3ef8..94e9e32f0b 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb | |||
| @@ -26,7 +26,7 @@ RCONFLICTS_${PN} = "task-core-boot" | |||
| 26 | # Distro can override the following VIRTUAL-RUNTIME providers: | 26 | # Distro can override the following VIRTUAL-RUNTIME providers: |
| 27 | VIRTUAL-RUNTIME_dev_manager ?= "udev" | 27 | VIRTUAL-RUNTIME_dev_manager ?= "udev" |
| 28 | VIRTUAL-RUNTIME_login_manager ?= "tinylogin" | 28 | VIRTUAL-RUNTIME_login_manager ?= "tinylogin" |
| 29 | VIRTUAL-RUNTIME_init_manager ?= "sysvinit" | 29 | VIRTUAL-RUNTIME_init_manager ?= "${DISTRO_FEATURES_INITMAN}" |
| 30 | VIRTUAL-RUNTIME_initscripts ?= "initscripts" | 30 | VIRTUAL-RUNTIME_initscripts ?= "initscripts" |
| 31 | VIRTUAL-RUNTIME_keymaps ?= "keymaps" | 31 | VIRTUAL-RUNTIME_keymaps ?= "keymaps" |
| 32 | 32 | ||