On Tue, Jun 06, 2023 at 02:10:19PM -0500, [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.
Heh, it's just a matter of personal preference :) Array indexing conditionals is how OE used to do things from the early days and I'm well used to that. But these days using Python if/else directly gained lots of traction, so why not? > 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. How much testing have you done with this change? The reason it was done this way is because many packages only provided sysvinit rc scripts and not systemd unit files and we were relying on systemd-sysv-generator to handle those, which has dependency on "sysvinit" PACKAGECONFIG and DISTRO_FEATURES. There were fixes to handle duplications when both sysvinit rc script and systemd unit file are provided by a package and install only one of them. It was better than not having any startup script for a package at all. > 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" > -- > 2.40.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#14504): https://lists.yoctoproject.org/g/meta-arago/message/14504 Mute This Topic: https://lists.yoctoproject.org/mt/99370291/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/leave/10763299/21656/89520264/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
