From 75fad30c62491d0246374cffd3a10b94499524ba Mon Sep 17 00:00:00 2001 From: Gyorgy Sarvari Date: Fri, 28 Nov 2025 21:26:39 +0100 Subject: [PATCH] dbus-broker: rework EXTRA_OEMESON opts to PACKAGECONFIG Signed-off-by: Gyorgy Sarvari Signed-off-by: Khem Raj --- meta-oe/recipes-core/dbus/dbus-broker_37.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-core/dbus/dbus-broker_37.bb b/meta-oe/recipes-core/dbus/dbus-broker_37.bb index c531f555d2..ae9c8f2fcd 100644 --- a/meta-oe/recipes-core/dbus/dbus-broker_37.bb +++ b/meta-oe/recipes-core/dbus/dbus-broker_37.bb @@ -6,8 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8" DEPENDS = "\ expat \ systemd \ - ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'audit (>= 3.0)', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'libselinux (>= 3.2)', '', d)} \ " SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/${BP}.tar.xz \ @@ -23,9 +21,11 @@ SYSTEMD_SERVICE:${PN} = "${BPN}.service" inherit meson pkgconfig systemd features_check ptest -EXTRA_OEMESON += "-Daudit=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}" -EXTRA_OEMESON += "-Dselinux=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}" -EXTRA_OEMESON += "-Dtests=${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'audit selinux', '', d)} \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'test', '', d)}" +PACKAGECONFIG[audit] = "-Daudit=true, -Daudit=false, audit (>= 3.0)" +PACKAGECONFIG[selinux] = "-Dselinux=true, -Dselinux=false, libselinux (>= 3.2)" +PACKAGECONFIG[test] = "-Dtests=true, -Dtests=false" REQUIRED_DISTRO_FEATURES = "systemd"