poky: Use INIT_MANAGER in main distro config

Just to keep things standard and clear, use the new INIT_MANAGER variable
in the main distro config. This matches the default config with the addition
of some DISTRO_FEATURES tweaks.

(From meta-yocto rev: 07556802447a157bfdae842354c064e50ae09d42)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2022-04-13 18:41:39 +01:00
parent ebb14f9530
commit a6ebbe3a10
3 changed files with 5 additions and 3 deletions

View File

@@ -8,8 +8,8 @@ DISTRO = "poky-altcfg"
DISTROOVERRIDES = "poky:poky-altcfg"
#DISTROOVERRIDES = "poky:linuxstdbase"
INIT_MANAGER ?= "systemd"
INIT_MANAGER:poky-altcfg = "systemd"
# systemd isn't suitable with musl
INIT_MANAGER:libc-musl ?= "sysvinit"
INIT_MANAGER:poky-altcfg:libc-musl = "sysvinit"
require conf/distro/include/poky-distro-alt-test-config.inc

View File

@@ -87,7 +87,7 @@ DISTRO_FEATURES:class-native = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO
DISTRO_FEATURES:class-nativesdk = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}"
# enable mdev/busybox for init
INIT_MANAGER ?= "mdev-busybox"
INIT_MANAGER:poky-tiny = "mdev-busybox"
# FIXME: Consider adding "modules" to MACHINE_FEATURES and using that in
# packagegroup-core-base to select modutils-initscripts or not. Similar with "net" and

View File

@@ -65,3 +65,5 @@ INHERIT += "uninative"
BB_SIGNATURE_HANDLER ?= "OEEquivHash"
BB_HASHSERVE ??= "auto"
INIT_MANAGER = "sysvinit"