@@ -920,7 +920,7 @@ DISTRO_FEATURES_NATIVESDK:mingw32 = "x11 ipv6"
DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation debuginfod opencl opengl wayland"
DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation debuginfod opencl opengl wayland"
-DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit gobject-introspection-data ldconfig"
+DISTRO_FEATURES_BACKFILL = "pulseaudio gobject-introspection-data ldconfig"
MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode"
COMBINED_FEATURES = "${@oe.utils.set_intersect('DISTRO_FEATURES', 'MACHINE_FEATURES', d)}"
@@ -12,5 +12,5 @@ PACKAGE_CLASSES ?= "package_ipk"
INHERIT_DISTRO ?= "debian devshell sstate license remove-libtool create-spdx buildstats"
INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} ${INHERIT_DISTRO}"
-INIT_MANAGER ??= "none"
+INIT_MANAGER ??= "systemd"
require conf/distro/include/init-manager-${INIT_MANAGER}.inc
@@ -1,5 +1,4 @@
# enable mdev/busybox for init
-DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " systemd sysvinit"
VIRTUAL-RUNTIME_dev_manager ??= "busybox-mdev"
VIRTUAL-RUNTIME_init_manager ??= "busybox"
VIRTUAL-RUNTIME_initscripts ??= "initscripts"
deleted file mode 100644
@@ -1,4 +0,0 @@
-VIRTUAL-RUNTIME_init_manager ??= "sysvinit"
-VIRTUAL-RUNTIME_initscripts ??= "initscripts"
-VIRTUAL-RUNTIME_login_manager ??= "busybox"
-VIRTUAL-RUNTIME_dev_manager ??= "udev"
@@ -1,6 +1,5 @@
# Use systemd for system initialization
DISTRO_FEATURES:append = " systemd usrmerge"
-DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " sysvinit"
VIRTUAL-RUNTIME_init_manager ??= "systemd"
VIRTUAL-RUNTIME_initscripts ??= ""
VIRTUAL-RUNTIME_login_manager ??= "shadow-base"
@@ -1,6 +1,5 @@
# Use sysvinit for system initialization
DISTRO_FEATURES:append = " sysvinit"
-DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " systemd"
VIRTUAL-RUNTIME_init_manager ??= "sysvinit"
VIRTUAL-RUNTIME_initscripts ??= "initscripts"
VIRTUAL-RUNTIME_login_manager ??= "busybox"
This change effectively switches things to use INIT_MANAGER to select the init system and drops the old compatibility 'none' method. The init manager selection is now complex enough that requiring users to select it makes sense. The new default is systemd, which reflects popular opinion. This is known to have issues in some of our configurations such as musl but is also frequently asked for. Anyone replacing defaultsetup.conf in their own setup will need to provide equivalent functionality but that is execpted for any of the settings in there. This change drops sysvinit from the default distro features backfill, meaning we no longer need to remove it in systemd setups and places the init managers on a more equal and equivalent standing. This is a behaviour change for anyone using nodistro and anyone not already setting INIT_MANAGER explictly. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- meta/conf/bitbake.conf | 2 +- meta/conf/distro/defaultsetup.conf | 2 +- meta/conf/distro/include/init-manager-mdev-busybox.inc | 1 - meta/conf/distro/include/init-manager-none.inc | 4 ---- meta/conf/distro/include/init-manager-systemd.inc | 1 - meta/conf/distro/include/init-manager-sysvinit.inc | 1 - 6 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 meta/conf/distro/include/init-manager-none.inc