summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-06 11:43:58 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-06 14:46:46 +0100
commita058af8c82738620c9aab784118fd9680abfcf55 (patch)
tree5a35e4aa6a2c2fc0df0f054004f45f02b0a25468
parent7bab9fe27ff6ed67c2f7dfbfe939527f1a6a4430 (diff)
downloadmeta-yocto-a058af8c82738620c9aab784118fd9680abfcf55.tar.gz
meta-yocto-a058af8c82738620c9aab784118fd9680abfcf55.tar.bz2
meta-yocto-a058af8c82738620c9aab784118fd9680abfcf55.zip
poky-tiny/poky-altcfg: Use busybox-mdev and systemd
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-poky/conf/distro/poky-altcfg.conf4
-rw-r--r--meta-poky/conf/distro/poky-tiny.conf7
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 c132349..177bf8d 100644
--- a/meta-poky/conf/distro/poky-altcfg.conf
+++ b/meta-poky/conf/distro/poky-altcfg.conf
@@ -8,4 +8,8 @@ DISTRO = "poky-altcfg"
DISTROOVERRIDES = "poky:poky-altcfg"
#DISTROOVERRIDES = "poky:linuxstdbase"
+INIT_MANAGER ?= "systemd"
+# systemd isn't suitable with musl
+INIT_MANAGER_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 8236b6f..c6d4b88 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
DISTRO_FEATURES_class-nativesdk = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}"
# enable mdev/busybox for init
-VIRTUAL-RUNTIME_dev_manager = "busybox-mdev"
-VIRTUAL-RUNTIME_login_manager = "busybox"
-VIRTUAL-RUNTIME_init_manager = "busybox"
-VIRTUAL-RUNTIME_initscripts = "initscripts"
-VIRTUAL-RUNTIME_keymaps = "keymaps"
-DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit"
+INIT_MANAGER ?= "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