From f8fb9675cf79b783ad610a1eff48f41310734056 Mon Sep 17 00:00:00 2001 From: Radu Moisan Date: Sat, 19 Jan 2013 22:47:04 +0000 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/conf/distro/include/default-distrovars.inc | 3 ++- 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 libc-posix-wchar-io" DISTRO_FEATURES_LIBC ?= "${DISTRO_FEATURES_LIBC_DEFAULT}" DISTRO_FEATURES_LIBC_class-nativesdk = "${DISTRO_FEATURES_LIBC_DEFAULT}" -DISTRO_FEATURES ?= "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g x11 ${DISTRO_FEATURES_LIBC}" +DISTRO_FEATURES_INITMAN ?= "sysvinit" +DISTRO_FEATURES ?= "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g x11 ${DISTRO_FEATURES_LIBC} ${DISTRO_FEATURES_INITMAN}" IMAGE_FEATURES ?= "" 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" # Distro can override the following VIRTUAL-RUNTIME providers: VIRTUAL-RUNTIME_dev_manager ?= "udev" VIRTUAL-RUNTIME_login_manager ?= "tinylogin" -VIRTUAL-RUNTIME_init_manager ?= "sysvinit" +VIRTUAL-RUNTIME_init_manager ?= "${DISTRO_FEATURES_INITMAN}" VIRTUAL-RUNTIME_initscripts ?= "initscripts" VIRTUAL-RUNTIME_keymaps ?= "keymaps" -- cgit v1.2.3-54-g00ecf