From a6ebbe3a10ff76386dde03ddaa7097bdb2f5d9a5 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 13 Apr 2022 18:41:39 +0100 Subject: 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 --- meta-poky/conf/distro/poky-altcfg.conf | 4 ++-- meta-poky/conf/distro/poky-tiny.conf | 2 +- meta-poky/conf/distro/poky.conf | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/meta-poky/conf/distro/poky-altcfg.conf b/meta-poky/conf/distro/poky-altcfg.conf index fbfabecd9d..f03306e798 100644 --- a/meta-poky/conf/distro/poky-altcfg.conf +++ b/meta-poky/conf/distro/poky-altcfg.conf @@ -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 diff --git a/meta-poky/conf/distro/poky-tiny.conf b/meta-poky/conf/distro/poky-tiny.conf index 9a31068790..9c9f6f192f 100644 --- a/meta-poky/conf/distro/poky-tiny.conf +++ b/meta-poky/conf/distro/poky-tiny.conf @@ -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 diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf index 179329f5fa..5790094ea9 100644 --- a/meta-poky/conf/distro/poky.conf +++ b/meta-poky/conf/distro/poky.conf @@ -65,3 +65,5 @@ INHERIT += "uninative" BB_SIGNATURE_HANDLER ?= "OEEquivHash" BB_HASHSERVE ??= "auto" + +INIT_MANAGER = "sysvinit" -- cgit v1.2.3-54-g00ecf