diff options
author | Kai Kang <kai.kang@windriver.com> | 2019-07-04 21:45:19 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-19 08:41:39 +0100 |
commit | 74646729a4cdb0a4d21dcbcb457ab1d7391a3d02 (patch) | |
tree | 4ac92eeb4f3b3b700c611601c3c2d45210e1f3ba /meta/conf | |
parent | 13881ed2bd9e8ff7e64e68fd8289bb96be712e5d (diff) | |
download | poky-74646729a4cdb0a4d21dcbcb457ab1d7391a3d02.tar.gz |
defaultsetup.conf: enable select init manager
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>
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/distro/defaultsetup.conf | 3 | ||||
-rw-r--r-- | meta/conf/distro/include/init-manager-mdev-busybox.inc | 7 | ||||
-rw-r--r-- | meta/conf/distro/include/init-manager-none.inc | 3 | ||||
-rw-r--r-- | meta/conf/distro/include/init-manager-systemd.inc | 6 | ||||
-rw-r--r-- | meta/conf/distro/include/init-manager-sysvinit.inc | 6 |
5 files changed, 25 insertions, 0 deletions
diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf index 20e61232e9..9b1ee20aaa 100644 --- a/meta/conf/distro/defaultsetup.conf +++ b/meta/conf/distro/defaultsetup.conf | |||
@@ -23,3 +23,6 @@ PACKAGE_CLASSES ?= "package_ipk" | |||
23 | INHERIT_BLACKLIST = "blacklist" | 23 | INHERIT_BLACKLIST = "blacklist" |
24 | INHERIT_DISTRO ?= "debian devshell sstate license remove-libtool" | 24 | INHERIT_DISTRO ?= "debian devshell sstate license remove-libtool" |
25 | INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} ${INHERIT_DISTRO} ${INHERIT_BLACKLIST}" | 25 | INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} ${INHERIT_DISTRO} ${INHERIT_BLACKLIST}" |
26 | |||
27 | INIT_MANAGER ??= "none" | ||
28 | require conf/distro/include/init-manager-${INIT_MANAGER}.inc | ||
diff --git a/meta/conf/distro/include/init-manager-mdev-busybox.inc b/meta/conf/distro/include/init-manager-mdev-busybox.inc new file mode 100644 index 0000000000..4e3be14a82 --- /dev/null +++ b/meta/conf/distro/include/init-manager-mdev-busybox.inc | |||
@@ -0,0 +1,7 @@ | |||
1 | # enable mdev/busybox for init | ||
2 | DISTRO_FEATURES_BACKFILL_CONSIDERED_append = " systemd sysvinit" | ||
3 | VIRTUAL-RUNTIME_dev_manager ??= "busybox-mdev" | ||
4 | VIRTUAL-RUNTIME_init_manager ??= "busybox" | ||
5 | VIRTUAL-RUNTIME_initscripts ??= "initscripts" | ||
6 | VIRTUAL-RUNTIME_keymaps ??= "keymaps" | ||
7 | VIRTUAL-RUNTIME_login_manager ??= "busybox" | ||
diff --git a/meta/conf/distro/include/init-manager-none.inc b/meta/conf/distro/include/init-manager-none.inc new file mode 100644 index 0000000000..bbedf898f7 --- /dev/null +++ b/meta/conf/distro/include/init-manager-none.inc | |||
@@ -0,0 +1,3 @@ | |||
1 | VIRTUAL-RUNTIME_init_manager ??= "sysvinit" | ||
2 | VIRTUAL-RUNTIME_initscripts ??= "initscripts" | ||
3 | VIRTUAL-RUNTIME_login_manager ??= "busybox" | ||
diff --git a/meta/conf/distro/include/init-manager-systemd.inc b/meta/conf/distro/include/init-manager-systemd.inc new file mode 100644 index 0000000000..1558b85250 --- /dev/null +++ b/meta/conf/distro/include/init-manager-systemd.inc | |||
@@ -0,0 +1,6 @@ | |||
1 | # Use systemd for system initialization | ||
2 | DISTRO_FEATURES_append = " systemd" | ||
3 | DISTRO_FEATURES_BACKFILL_CONSIDERED_append = " sysvinit" | ||
4 | VIRTUAL-RUNTIME_init_manager ??= "systemd" | ||
5 | VIRTUAL-RUNTIME_initscripts ??= "systemd-compat-units" | ||
6 | VIRTUAL-RUNTIME_login_manager ??= "shadow-base" | ||
diff --git a/meta/conf/distro/include/init-manager-sysvinit.inc b/meta/conf/distro/include/init-manager-sysvinit.inc new file mode 100644 index 0000000000..6b662d60bb --- /dev/null +++ b/meta/conf/distro/include/init-manager-sysvinit.inc | |||
@@ -0,0 +1,6 @@ | |||
1 | # Use sysvinit for system initialization | ||
2 | DISTRO_FEATURES_append = " sysvinit" | ||
3 | DISTRO_FEATURES_BACKFILL_CONSIDERED_append = " systemd" | ||
4 | VIRTUAL-RUNTIME_init_manager ??= "sysvinit" | ||
5 | VIRTUAL-RUNTIME_initscripts ??= "initscripts" | ||
6 | VIRTUAL-RUNTIME_login_manager ??= "busybox" | ||