On 6/6/23 2:10 PM, [email protected] wrote:
From: Randolph Sapp <[email protected]>
Make things more readable and reliable by useing the built in boolean
check instead of python's type casting. Drop the array indexing in favor
of a more direct if else statememnt.
Also fix the virtual provider for login manager. There should only be 1
login provider and it should be shadow-base for systemd *or* busybox for
sysVinit systemd.
Also explicitly remove the sysvinit distro feature if ARAGO_SYSVINIT
isn't set, because whatever arago inherits expects sysvinit for some
reason. This should fix the duplicate init.d and systemd service files
we've been seeing.
Probably could have been two patches.. both look like good fixes though,
Reviewed-by: Andrew Davis <[email protected]>
Signed-off-by: Randolph Sapp <[email protected]>
---
meta-arago-distro/conf/distro/arago.conf | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/meta-arago-distro/conf/distro/arago.conf
b/meta-arago-distro/conf/distro/arago.conf
index 9164657c..6390a916 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -59,13 +59,14 @@ DISTRO_FEATURES_FILTER_NATIVESDK:append = " opencl opencv
openmp"
# Set global runtime providers for major components
ARAGO_SYSVINIT ?= "0"
-VIRTUAL-RUNTIME_dev_manager = "${@["udev",
"systemd"][bool(d.getVar("ARAGO_SYSVINIT"))]}"
-VIRTUAL-RUNTIME_init_manager = "${@["sysvinit",
"systemd"][bool(d.getVar("ARAGO_SYSVINIT"))]}"
-VIRTUAL-RUNTIME_initscripts = "${@["initscripts",
"systemd-compat-units"][bool(d.getVar("ARAGO_SYSVINIT"))]}"
-VIRTUAL-RUNTIME_initramfs = "${@["sysvinit-initramfs",
"systemd-initramfs"][bool(d.getVar("ARAGO_SYSVINIT"))]}"
-VIRTUAL-RUNTIME_login_manager = "busybox shadow"
-
-DISTRO_FEATURES:append = "${@["","
systemd"][bool(d.getVar("ARAGO_SYSVINIT"))]}"
+VIRTUAL-RUNTIME_dev_manager = "${@ 'udev' if
oe.types.boolean(d.getVar('ARAGO_SYSVINIT')) else 'systemd'}"
+VIRTUAL-RUNTIME_init_manager = "${@ 'sysvinit' if
oe.types.boolean(d.getVar('ARAGO_SYSVINIT')) else 'systemd'}"
+VIRTUAL-RUNTIME_initscripts = "${@ 'initscripts' if
oe.types.boolean(d.getVar('ARAGO_SYSVINIT')) else 'systemd-compat-units'}"
+VIRTUAL-RUNTIME_initramfs = "${@ 'sysvinit-initramfs' if
oe.types.boolean(d.getVar('ARAGO_SYSVINIT')) else 'systemd-initramfs'}"
+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"
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#14502):
https://lists.yoctoproject.org/g/meta-arago/message/14502
Mute This Topic: https://lists.yoctoproject.org/mt/99370291/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
