Skip to contentSkip to conversation

arago-tiny-image: set ARAGO_SYSVINIT properly

PATCH New [email protected] 1 participant 1 message Jul 6, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arago-tiny-image: set ARAGO_SYSVINIT properly

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.

---
 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(-)
meta-arago-distro/conf/distro/arago.conf +1 -0
index e0087ab7..e00dddd4 100644
@@ -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"
meta-arago-distro/recipes-core/images/arago-tiny-image.inc +1 -5
index 242e763c..e5c75946 100644
@@ -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"
Signature · 1 line
2.41.0