From: Randolph Sapp <[email protected]> Set ARAGO_SYSVINIT init properly so the init system and login service gets configured properly. Also add the bite back in from my old patch to drop the sysvinit distro feature when systemd is selected so we don't have legacy init scripts and modern init scripts mixed in the images that use systemd.
Signed-off-by: Randolph Sapp <[email protected]> --- meta-arago-distro/conf/distro/arago.conf | 1 + meta-arago-distro/recipes-core/images/arago-tiny-image.inc | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf index e0087ab7..e00dddd4 100644 --- a/meta-arago-distro/conf/distro/arago.conf +++ b/meta-arago-distro/conf/distro/arago.conf @@ -66,6 +66,7 @@ VIRTUAL-RUNTIME_initramfs = "${@'sysvinit-initramfs' if oe.types.boolean(d.getVa VIRTUAL-RUNTIME_login_manager = "${@'busybox' if oe.types.boolean(d.getVar('ARAGO_SYSVINIT')) else 'shadow-base'}" DISTRO_FEATURES:append = " ${@'' if oe.types.boolean(d.getVar('ARAGO_SYSVINIT')) else ' systemd'}" +DISTRO_FEATURES:remove = " ${@'' if oe.types.boolean(d.getVar('ARAGO_SYSVINIT')) else ' sysvinit'}" # Distro-specific package configuration PACKAGECONFIG:append:pn-systemd = " coredump networkd resolved serial-getty-generator" diff --git a/meta-arago-distro/recipes-core/images/arago-tiny-image.inc b/meta-arago-distro/recipes-core/images/arago-tiny-image.inc index 242e763c..e5c75946 100644 --- a/meta-arago-distro/recipes-core/images/arago-tiny-image.inc +++ b/meta-arago-distro/recipes-core/images/arago-tiny-image.inc @@ -1,9 +1,5 @@ -ARAGO_SYSVINIT = "1" - require arago-image.inc IMAGE_FEATURES:remove = "splash" -IMAGE_INSTALL = " \ - packagegroup-arago-sysvinit-boot \ -" +ARAGO_SYSVINIT[export] := "1" -- 2.41.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#14769): https://lists.yoctoproject.org/g/meta-arago/message/14769 Mute This Topic: https://lists.yoctoproject.org/mt/99987891/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
