From 3cdd930eeb9f0f3aedc552fdf8157d9baeb40b58 Mon Sep 17 00:00:00 2001 From: Radu Moisan Date: Mon, 17 Sep 2012 18:25:52 -0500 Subject: dbus: include dbus-launch in the main dbus package 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) make dbus provide dbus-x11, for compatibility. Fixes [Yocto #2261] (From OE-Core rev: 9bf6d834312581e8b8741fb9d1621e4c40de5687) Signed-off-by: Radu Moisan Signed-off-by: Richard Purdie --- meta/recipes-core/dbus/dbus.inc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'meta') diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index e9e287b8c6..d1e83bfce8 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc @@ -31,10 +31,11 @@ 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 +RPROVIDES_${PN} = "dbus-x11" +RREPLACES_${PN} += "dbus-x11" FILES_${PN}-systemd = "${systemd_unitdir}/system/" @@ -43,6 +44,7 @@ FILES_${PN} = "${bindir}/dbus-daemon* \ ${bindir}/dbus-cleanup-sockets \ ${bindir}/dbus-send \ ${bindir}/dbus-monitor \ + ${bindir}/dbus-launch \ ${libexecdir}/dbus* \ ${sysconfdir} \ ${localstatedir} \ @@ -59,7 +61,7 @@ pkg_postinst_dbus() { } EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" -EXTRA_OECONF_X_virtclass-native = "--without-x" +EXTRA_OECONF_X_virtclass-native = "--disable-x11-autolaunch" EXTRA_OECONF = "--disable-tests \ --disable-checks \ -- cgit v1.2.3-54-g00ecf