From 8dc49ecfc8546640fc7b3f0453b428cf9045eda1 Mon Sep 17 00:00:00 2001 From: Wayne Ren Date: Tue, 19 Aug 2025 17:12:43 +0800 Subject: [PATCH] openeuler: optimize VIRTUAL-RUNTIME_dev_manager and upsupported features * optimize the setting of VIRTUAL-RUNTIME_dev_manager, use systemd or busybox-mdev, or set in local.conf explicitly. * optimize the setting of DISTRO_FEATURES_DEFAULT, no "3g phone" by default Signed-off-by: Wayne Ren --- meta-openeuler/conf/distro/openeuler.conf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/meta-openeuler/conf/distro/openeuler.conf b/meta-openeuler/conf/distro/openeuler.conf index fa3e484e08c..1b8cdc8ce79 100644 --- a/meta-openeuler/conf/distro/openeuler.conf +++ b/meta-openeuler/conf/distro/openeuler.conf @@ -14,10 +14,13 @@ TARGET_VENDOR = "-openeuler" ## runtime/rootfs related configurations # define default init and device manager -# INIT_MANAGER set VIRTUAL-RUNTIME_dev_manager when expanding, while there is an -# expanding time gap between some packagegroups expansion and VIRUTLA-RUNTIME_dev_manager expansion. -VIRTUAL-RUNTIME_dev_manager ?= "busybox-mdev" +# INIT_MANAGER set VIRTUAL-RUNTIME_dev_manager when expanding, +# but packagegroup-core-boot.bb will set VIRTUAL-RUNTIME_dev_manager to udev, it has a higher priority +# than init-manager-xxx.inc, because ? priority is higher than ?? +# so we set VIRTUAL-RUNTIME_dev_manager explicitly here, use busybox or systemd , no eudev except declared in local.conf +# or when sysvinit is enabled, set VIRTUAL-RUNTIME_dev_manager explicitly. INIT_MANAGER ?= "mdev-busybox" +VIRTUAL-RUNTIME_dev_manager ?= "${@['systemd', 'busybox-mdev']['${INIT_MANAGER}' == 'mdev-busybox']}" # pam package is used for authentication OPENEULER_DEFAULT_DISTRO_FEATURES = "pam" # define root home, default /home/root @@ -29,11 +32,8 @@ DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${OPENEULER_DEFAULT_DISTRO_FEATUR # added into DISTRO_FEATURES DISTRO_FEATURES += "${@['', 'sysvinit']['${INIT_MANAGER}' == 'mdev-busybox']}" -# remove currently unsupported features -DISTRO_FEATURES_DEFAULT:remove = "x11 \ - ${@bb.utils.contains('INIT_MANAGER', 'mdev-busybox', '3g phone', '', d)} \ - ${@bb.utils.contains('INIT_MANAGER', 'none', '3g phone', '', d)} \ -" +# remove currently unsupported features in openeuler embedded +DISTRO_FEATURES_DEFAULT:remove = "x11 3g phone " ## kernel related configurations # the oldest kernel supported by openeuler embedded is 5.10 -- Gitee