Skip to contentSkip to conversation

arago.conf: simplify DISTRO_FEATURES logic to not rely on oe/lib

PATCH New Denys Dmytriyenko 1 participant 1 message Jan 31, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arago.conf: simplify DISTRO_FEATURES logic to not rely on oe/lib

---
 meta-arago-distro/conf/distro/arago.conf | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
meta-arago-distro/conf/distro/arago.conf +5 -5
index 99ba36f..026dae2 100644
@@ -82,13 +82,13 @@ DISTRO_FEATURES_append = " pam wayland opengl"
 
 # Set global runtime providers for major components
 ARAGO_SYSVINIT ?= "0"
-VIRTUAL-RUNTIME_dev_manager = "${@oe.utils.conditional("ARAGO_SYSVINIT", "1", "udev", "systemd", d)}"
-VIRTUAL-RUNTIME_init_manager = "${@oe.utils.conditional("ARAGO_SYSVINIT", "1", "sysvinit", "systemd", d)}"
-VIRTUAL-RUNTIME_initscripts = "${@oe.utils.conditional("ARAGO_SYSVINIT", "1", "initscripts", "systemd-compat-units", d)}"
-VIRTUAL-RUNTIME_initramfs = "${@oe.utils.conditional("ARAGO_SYSVINIT", "1", "sysvinit-initramfs", "systemd-initramfs", d)}"
+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 = "${@oe.utils.conditional("ARAGO_SYSVINIT", "1", "", " systemd", d)}"
+DISTRO_FEATURES_append = "${@[""," systemd"][bool(d.getVar("ARAGO_SYSVINIT"))]}"
 
 # Set preferred Qt version
 QT_PROVIDER ?= "qt5"
Signature · 1 line
2.7.4