summaryrefslogtreecommitdiffstats
path: root/meta-poky/conf
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:48:28 +0100
commit2cd5daffe06b430b33240a99e5dcfd6eb66c8f45 (patch)
treea5d3d5e30928df2b61f6d8229704322caee2ab8a /meta-poky/conf
parent0c8397aa684cc916ddaf345be78e786ab5480b3b (diff)
downloadpoky-2cd5daffe06b430b33240a99e5dcfd6eb66c8f45.tar.gz
poky-2cd5daffe06b430b33240a99e5dcfd6eb66c8f45.tar.bz2
poky-2cd5daffe06b430b33240a99e5dcfd6eb66c8f45.zip
poky-tiny/poky-altcfg: Use busybox-mdev and systemd
(From meta-yocto rev: a058af8c82738620c9aab784118fd9680abfcf55) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-poky/conf')
-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 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"
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 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
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