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:48:28 +0100
commit2cd5daffe06b430b33240a99e5dcfd6eb66c8f45 (patch)
treea5d3d5e30928df2b61f6d8229704322caee2ab8a
parent0c8397aa684cc916ddaf345be78e786ab5480b3b (diff)
downloadpoky-2cd5daffe06b430b33240a99e5dcfd6eb66c8f45.tar.gz
poky-tiny/poky-altcfg: Use busybox-mdev and systemd
(From meta-yocto rev: a058af8c82738620c9aab784118fd9680abfcf55) 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 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"
8DISTROOVERRIDES = "poky:poky-altcfg" 8DISTROOVERRIDES = "poky:poky-altcfg"
9#DISTROOVERRIDES = "poky:linuxstdbase" 9#DISTROOVERRIDES = "poky:linuxstdbase"
10 10
11INIT_MANAGER ?= "systemd"
12# systemd isn't suitable with musl
13INIT_MANAGER_libc-musl ?= "sysvinit"
14
11require conf/distro/include/poky-distro-alt-test-config.inc 15require 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
82DISTRO_FEATURES_class-nativesdk = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" 82DISTRO_FEATURES_class-nativesdk = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}"
83 83
84# enable mdev/busybox for init 84# enable mdev/busybox for init
85VIRTUAL-RUNTIME_dev_manager = "busybox-mdev" 85INIT_MANAGER ?= "mdev-busybox"
86VIRTUAL-RUNTIME_login_manager = "busybox"
87VIRTUAL-RUNTIME_init_manager = "busybox"
88VIRTUAL-RUNTIME_initscripts = "initscripts"
89VIRTUAL-RUNTIME_keymaps = "keymaps"
90DISTRO_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