| Message ID | 20250328150136.1855862-6-niko.mauno@vaisala.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2,1/6] default-providers: Add VIRTUAL-RUNTIME_dbus variable | expand |
On 28 Mar 2025, at 15:01, Niko Mauno <niko.mauno@vaisala.com> wrote: > -RDEPENDS:${PN} += "dbus" > +RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_dbus}" I suspect you can actually drop these lines in this patch instead of changing it to use the variable, as the binaries use libdbus then they will pull in the bus via that dependency anyway. Ross
On 31.3.2025 19.21, Ross Burton wrote: > On 28 Mar 2025, at 15:01, Niko Mauno <niko.mauno@vaisala.com> wrote: >> -RDEPENDS:${PN} += "dbus" >> +RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_dbus}" > > I suspect you can actually drop these lines in this patch instead of changing it to use the variable, as the binaries use libdbus then they will pull in the bus via that dependency anyway. > > Ross Thanks Ross, submitted v3 in which the RDEPENDS:${PN} lines are dropped altogether in the topmost commit. -Niko
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index d626872103..09afd8f7c9 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \ file://src/main.c;beginline=1;endline=24;md5=0ad83ca0dc37ab08af448777c581e7ac" DEPENDS = "dbus glib-2.0" -RDEPENDS:${PN} += "dbus" +RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_dbus}" PROVIDES += "bluez-hcidump" RPROVIDES:${PN} += "bluez-hcidump" diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index 133e8616da..fa546ee872 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -119,7 +119,7 @@ RPROVIDES:${PN} = "\ " RDEPENDS:${PN} = "\ - dbus \ + ${VIRTUAL-RUNTIME_dbus} \ " PACKAGES_DYNAMIC += "^${PN}-plugin-.*" diff --git a/meta/recipes-connectivity/neard/neard_0.19.bb b/meta/recipes-connectivity/neard/neard_0.19.bb index b04187bcc5..6a1314a957 100644 --- a/meta/recipes-connectivity/neard/neard_0.19.bb +++ b/meta/recipes-connectivity/neard/neard_0.19.bb @@ -37,7 +37,7 @@ do_install:append() { fi } -RDEPENDS:${PN} = "dbus" +RDEPENDS:${PN} = "${VIRTUAL-RUNTIME_dbus}" # Bluez & Wifi are not mandatory except for handover WIRELESS_DAEMON ??= "wpa-supplicant" diff --git a/meta/recipes-connectivity/ofono/ofono_2.15.bb b/meta/recipes-connectivity/ofono/ofono_2.15.bb index 40eeb3a086..fddd9b8738 100644 --- a/meta/recipes-connectivity/ofono/ofono_2.15.bb +++ b/meta/recipes-connectivity/ofono/ofono_2.15.bb @@ -37,7 +37,7 @@ PACKAGES =+ "${PN}-tests" FILES:${PN} += "${systemd_unitdir}" FILES:${PN}-tests = "${libdir}/${BPN}/test" -RDEPENDS:${PN} += "dbus" +RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_dbus}" RDEPENDS:${PN}-tests = "\ python3-core \ python3-dbus \
In order to facilitate oe-core users who wish to use e.g. dbus-broker as their runtime D-Bus implementation, change the Freedesktop.org specific D-Bus runtime dependency to honor the new VIRTUAL-RUNTIME_dbus variable. Signed-off-by: Niko Mauno <niko.mauno@vaisala.com> --- meta/recipes-connectivity/bluez5/bluez5.inc | 2 +- meta/recipes-connectivity/connman/connman.inc | 2 +- meta/recipes-connectivity/neard/neard_0.19.bb | 2 +- meta/recipes-connectivity/ofono/ofono_2.15.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)