summaryrefslogtreecommitdiffstats
path: root/meta/conf/distro
diff options
context:
space:
mode:
authorPeter Marko <peter.marko@siemens.com>2024-11-27 20:23:33 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-11-28 12:27:11 +0000
commitd5655569e12f816e21144eaecda19427a6de0f6a (patch)
treea05e1c913da9029603f5d539b8fec8d963cdc89d /meta/conf/distro
parent86bfd2c7a29761450d8c92dc117dfe24b2632add (diff)
downloadpoky-d5655569e12f816e21144eaecda19427a6de0f6a.tar.gz
init-manager: define dev_manager for all init managers
Currently VIRTUAL-RUNTIME_dev_manager is defined by some init managers with "??=" and in packagegroup-core-boot with "?=". This means that this variable is different in this package group and in all other the recipes. This was discovered when trying to use new feature INIT_MANAGER when migrating to scarthgap and using systemd distro. After deleting all VIRTUAL_RUNTIME providers defined in init-manager-systemd udev was installed additionally via packagegroup-core-boot. Having a distro settings overriden in single recipe is wrong and needs to be corrected. Therefore let's define the setting in all init managers and remove it from packagegroup-core-boot. core-image-tiny-initramfs has a dilemma - use busybox-mdev even if distro does not enable it in busybox recipe to keep the image tiny, or rather not install it even if distro enables it in busybox. This patch chooses the first option. (From OE-Core rev: 89e2652ac83f2602d6dd60623a225b88dc67d288) Signed-off-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/distro')
-rw-r--r--meta/conf/distro/include/init-manager-none.inc1
-rw-r--r--meta/conf/distro/include/init-manager-sysvinit.inc1
2 files changed, 2 insertions, 0 deletions
diff --git a/meta/conf/distro/include/init-manager-none.inc b/meta/conf/distro/include/init-manager-none.inc
index bbedf898f7..6ece5c9906 100644
--- a/meta/conf/distro/include/init-manager-none.inc
+++ b/meta/conf/distro/include/init-manager-none.inc
@@ -1,3 +1,4 @@
1VIRTUAL-RUNTIME_init_manager ??= "sysvinit" 1VIRTUAL-RUNTIME_init_manager ??= "sysvinit"
2VIRTUAL-RUNTIME_initscripts ??= "initscripts" 2VIRTUAL-RUNTIME_initscripts ??= "initscripts"
3VIRTUAL-RUNTIME_login_manager ??= "busybox" 3VIRTUAL-RUNTIME_login_manager ??= "busybox"
4VIRTUAL-RUNTIME_dev_manager ??= "udev"
diff --git a/meta/conf/distro/include/init-manager-sysvinit.inc b/meta/conf/distro/include/init-manager-sysvinit.inc
index aa2393944d..e2d17b358d 100644
--- a/meta/conf/distro/include/init-manager-sysvinit.inc
+++ b/meta/conf/distro/include/init-manager-sysvinit.inc
@@ -4,3 +4,4 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " systemd"
4VIRTUAL-RUNTIME_init_manager ??= "sysvinit" 4VIRTUAL-RUNTIME_init_manager ??= "sysvinit"
5VIRTUAL-RUNTIME_initscripts ??= "initscripts" 5VIRTUAL-RUNTIME_initscripts ??= "initscripts"
6VIRTUAL-RUNTIME_login_manager ??= "busybox" 6VIRTUAL-RUNTIME_login_manager ??= "busybox"
7VIRTUAL-RUNTIME_dev_manager ??= "udev"