diff options
| author | Niko Mauno <niko.mauno@vaisala.com> | 2025-04-04 10:51:48 +0000 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2025-04-24 18:43:18 -0700 |
| commit | 86c0c57ddd51c83b57f3ced6a7b87d63a08d010a (patch) | |
| tree | 163ef584fbaa4d8dee34aae06ea13227e029dfd5 | |
| parent | b63f5b4c8a80556d55a7395ed397f4be94cba943 (diff) | |
| download | meta-openembedded-86c0c57ddd51c83b57f3ced6a7b87d63a08d010a.tar.gz | |
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 <niko.mauno@vaisala.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-core/dbus/dbus-broker_36.bb | 1 |
1 files changed, 1 insertions, 0 deletions
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() { | |||
| 30 | ln -s ${systemd_user_unitdir}/dbus-broker.service ${D}${sysconfdir}/systemd/user/dbus.service | 30 | ln -s ${systemd_user_unitdir}/dbus-broker.service ${D}${sysconfdir}/systemd/user/dbus.service |
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | RCONFLICTS:${PN} = "dbus" | ||
| 33 | RDEPENDS:${PN} += "dbus-common" | 34 | RDEPENDS:${PN} += "dbus-common" |
| 34 | 35 | ||
| 35 | FILES:${PN} += "${nonarch_libdir}/systemd/catalog" | 36 | FILES:${PN} += "${nonarch_libdir}/systemd/catalog" |