From 86c0c57ddd51c83b57f3ced6a7b87d63a08d010a Mon Sep 17 00:00:00 2001 From: Niko Mauno Date: Fri, 4 Apr 2025 10:51:48 +0000 Subject: [PATCH] dbus-broker: Declare runtime conflict with dbus The user should now be able to choose the preferred runtime D-Bus implementation with VIRTUAL-RUNTIME_dbus variable. In order to avoid situation where both Freedesktop.org's dbus and dbus-broker are pulled into the same root filesystem, add conflict declaration which will help to detect the problem already during the Yocto build. Signed-off-by: Niko Mauno Signed-off-by: Khem Raj --- meta-oe/recipes-core/dbus/dbus-broker_36.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-core/dbus/dbus-broker_36.bb b/meta-oe/recipes-core/dbus/dbus-broker_36.bb index 5b4915f968..8c8f2d2469 100644 --- a/meta-oe/recipes-core/dbus/dbus-broker_36.bb +++ b/meta-oe/recipes-core/dbus/dbus-broker_36.bb @@ -30,6 +30,7 @@ do_install:append() { ln -s ${systemd_user_unitdir}/dbus-broker.service ${D}${sysconfdir}/systemd/user/dbus.service } +RCONFLICTS:${PN} = "dbus" RDEPENDS:${PN} += "dbus-common" FILES:${PN} += "${nonarch_libdir}/systemd/catalog"