From patchwork Fri Jul 27 06:22:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v5] dbus: include dbus-launch in the main dbus package Date: Fri, 27 Jul 2012 06:22:17 -0000 From: Radu Moisan X-Patchwork-Id: 33173 Message-Id: <1343370137-30705-1-git-send-email-radu.moisan@intel.com> To: openembedded-core@lists.openembedded.org Followed suggestions from Bugz 2261: 2) make the virtual/libx11 DEPENDS conditional based on the x11 distro feature. This makes the build dependencies reflect the feature list. 3) remove dbus-x11, meaning that dbus-launch with its potential X11 dependency is now back in dbus where is belongs. 4) Potentially make dbus provide dbus-x11, for compatibility. Fixes [Yocto #2261] Signed-off-by: Radu Moisan --- meta/recipes-core/dbus/dbus.inc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index a75583d..b01323b 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc @@ -31,10 +31,12 @@ CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session DEBIANNAME_${PN} = "dbus-1" -PACKAGES =+ "${PN}-lib ${PN}-systemd ${@base_contains('DISTRO_FEATURES', 'x11', '${PN}-x11', '', d)}" +PACKAGES =+ "${PN}-lib ${PN}-systemd" -FILES_${PN}-x11 = "${bindir}/dbus-launch" -RDEPENDS_${PN}-x11 = "${PN}" +# for compatibility +PROVIDES = "dbus-x11" +RPROVIDES_${PN} = "dbus-x11" +RREPLACES_${PN} += "dbus-x11" FILES_${PN}-systemd = "${systemd_unitdir}/system/" @@ -43,6 +45,7 @@ FILES_${PN} = "${bindir}/dbus-daemon* \ ${bindir}/dbus-cleanup-sockets \ ${bindir}/dbus-send \ ${bindir}/dbus-monitor \ + ${bindir}/dbus-launch \ ${libexecdir}/dbus* \ ${sysconfdir} \ ${localstatedir} \