diff options
-rw-r--r-- | meta-poky/conf/distro/poky-altcfg.conf | 4 | ||||
-rw-r--r-- | meta-poky/conf/distro/poky-tiny.conf | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/meta-poky/conf/distro/poky-altcfg.conf b/meta-poky/conf/distro/poky-altcfg.conf index c132349afd..177bf8d184 100644 --- a/meta-poky/conf/distro/poky-altcfg.conf +++ b/meta-poky/conf/distro/poky-altcfg.conf | |||
@@ -8,4 +8,8 @@ DISTRO = "poky-altcfg" | |||
8 | DISTROOVERRIDES = "poky:poky-altcfg" | 8 | DISTROOVERRIDES = "poky:poky-altcfg" |
9 | #DISTROOVERRIDES = "poky:linuxstdbase" | 9 | #DISTROOVERRIDES = "poky:linuxstdbase" |
10 | 10 | ||
11 | INIT_MANAGER ?= "systemd" | ||
12 | # systemd isn't suitable with musl | ||
13 | INIT_MANAGER_libc-musl ?= "sysvinit" | ||
14 | |||
11 | require conf/distro/include/poky-distro-alt-test-config.inc | 15 | 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 8236b6f273..c6d4b88f83 100644 --- a/meta-poky/conf/distro/poky-tiny.conf +++ b/meta-poky/conf/distro/poky-tiny.conf | |||
@@ -82,12 +82,7 @@ DISTRO_FEATURES_class-native = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO | |||
82 | DISTRO_FEATURES_class-nativesdk = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" | 82 | DISTRO_FEATURES_class-nativesdk = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" |
83 | 83 | ||
84 | # enable mdev/busybox for init | 84 | # enable mdev/busybox for init |
85 | VIRTUAL-RUNTIME_dev_manager = "busybox-mdev" | 85 | INIT_MANAGER ?= "mdev-busybox" |
86 | VIRTUAL-RUNTIME_login_manager = "busybox" | ||
87 | VIRTUAL-RUNTIME_init_manager = "busybox" | ||
88 | VIRTUAL-RUNTIME_initscripts = "initscripts" | ||
89 | VIRTUAL-RUNTIME_keymaps = "keymaps" | ||
90 | DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit" | ||
91 | 86 | ||
92 | # FIXME: Consider adding "modules" to MACHINE_FEATURES and using that in | 87 | # FIXME: Consider adding "modules" to MACHINE_FEATURES and using that in |
93 | # packagegroup-core-base to select modutils-initscripts or not. Similar with "net" and | 88 | # packagegroup-core-base to select modutils-initscripts or not. Similar with "net" and |