diff mbox series

[meta-arago,master/kirkstone] arago-tiny-image: set ARAGO_SYSVINIT properly

Message ID 20230706152922.1722000-1-rs@ti.com
State Rejected
Delegated to: Ryan Eatmon
Headers show
Series [meta-arago,master/kirkstone] arago-tiny-image: set ARAGO_SYSVINIT properly | expand

Commit Message

Randolph Sapp July 6, 2023, 3:29 p.m. UTC 
From: Randolph Sapp <rs@ti.com>

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 <rs@ti.com>
---
 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 mbox series

Patch

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"