mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-04 02:00:04 +00:00
Code Issues Projects Releases Wiki Activity

defaultsetup.conf: enable select init manager

Browse Source 
Introduce a new variable INIT_MANAGER and create 4 init-manager-*.inc
files to configure init manager settings. Available values of
INIT_MANAGER are sysvinit, systemd, mdev-busybox and a default of none.
'none' provides backwards compatibility.

The settings of various VIRTUAL-RUNTIME variables are moved into these
files from the packagegroups.

[YOCTO #13031]

[Modifications by RP for backwards compatibility]

(From OE-Core rev: 8d0b4704a526a48cd5e67df61b613424bbbdccde)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Kai Kang
2019-07-04 21:45:19 +08:00
committed by Richard Purdie
parent 13881ed2bd
commit 74646729a4
7 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/conf/distro/defaultsetup.conf
+3
View File
@@ -23,3 +23,6 @@ PACKAGE_CLASSES ?= "package_ipk"
INHERIT_BLACKLIST = "blacklist"
INHERIT_DISTRO ?= "debian devshell sstate license remove-libtool"
INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} ${INHERIT_DISTRO} ${INHERIT_BLACKLIST}"
INIT_MANAGER ??= "none"
require conf/distro/include/init-manager-${INIT_MANAGER}.inc
meta/conf/distro/include/init-manager-mdev-busybox.inc
+7
View File
@@ -0,0 +1,7 @@
# enable mdev/busybox for init
DISTRO_FEATURES_BACKFILL_CONSIDERED_append = " systemd sysvinit"
VIRTUAL-RUNTIME_dev_manager ??= "busybox-mdev"
VIRTUAL-RUNTIME_init_manager ??= "busybox"
VIRTUAL-RUNTIME_initscripts ??= "initscripts"
VIRTUAL-RUNTIME_keymaps ??= "keymaps"
VIRTUAL-RUNTIME_login_manager ??= "busybox"
meta/conf/distro/include/init-manager-none.inc
+3
View File
@@ -0,0 +1,3 @@
VIRTUAL-RUNTIME_init_manager ??= "sysvinit"
VIRTUAL-RUNTIME_initscripts ??= "initscripts"
VIRTUAL-RUNTIME_login_manager ??= "busybox"
meta/conf/distro/include/init-manager-systemd.inc
+6
View File
@@ -0,0 +1,6 @@
# Use systemd for system initialization
DISTRO_FEATURES_append = " systemd"
DISTRO_FEATURES_BACKFILL_CONSIDERED_append = " sysvinit"
VIRTUAL-RUNTIME_init_manager ??= "systemd"
VIRTUAL-RUNTIME_initscripts ??= "systemd-compat-units"
VIRTUAL-RUNTIME_login_manager ??= "shadow-base"
meta/conf/distro/include/init-manager-sysvinit.inc
+6
View File
@@ -0,0 +1,6 @@
# Use sysvinit for system initialization
DISTRO_FEATURES_append = " sysvinit"
DISTRO_FEATURES_BACKFILL_CONSIDERED_append = " systemd"
VIRTUAL-RUNTIME_init_manager ??= "sysvinit"
VIRTUAL-RUNTIME_initscripts ??= "initscripts"
VIRTUAL-RUNTIME_login_manager ??= "busybox"
meta/recipes-core/packagegroups/packagegroup-core-boot.bb
-3
View File
@@ -18,9 +18,6 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
# Distro can override the following VIRTUAL-RUNTIME providers:
VIRTUAL-RUNTIME_dev_manager ?= "udev"
VIRTUAL-RUNTIME_login_manager ?= "busybox"
VIRTUAL-RUNTIME_init_manager ?= "sysvinit"
VIRTUAL-RUNTIME_initscripts ?= "initscripts"
VIRTUAL-RUNTIME_keymaps ?= "keymaps"
EFI_PROVIDER ??= "grub-efi"
meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
-3
View File
@@ -111,9 +111,6 @@ RDEPENDS_packagegroup-core-full-cmdline-dev-utils = "\
patch \
"
VIRTUAL-RUNTIME_initscripts ?= "initscripts"
VIRTUAL-RUNTIME_init_manager ?= "sysvinit"
VIRTUAL-RUNTIME_login_manager ?= "busybox"
VIRTUAL-RUNTIME_syslog ?= "sysklogd"
RDEPENDS_packagegroup-core-full-cmdline-initscripts = "\
${VIRTUAL-RUNTIME_initscripts} \