summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRadu Moisan <radu.moisan@intel.com>2012-09-17 23:25:52 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-28 15:53:18 (GMT)
commit3cdd930eeb9f0f3aedc552fdf8157d9baeb40b58 (patch)
tree22e78fedc47bc3fabda9f8746433eb6431d55648 /meta/recipes-core
parentcfd36177f70e00ef472b7ef6115dd1028d9c09a3 (diff)
downloadpoky-3cdd930eeb9f0f3aedc552fdf8157d9baeb40b58.tar.gz
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 <radu.moisan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/dbus/dbus.inc10
1 files changed, 6 insertions, 4 deletions
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index e9e287b..d1e83bf 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
31 31
32DEBIANNAME_${PN} = "dbus-1" 32DEBIANNAME_${PN} = "dbus-1"
33 33
34PACKAGES =+ "${PN}-lib ${PN}-systemd ${@base_contains('DISTRO_FEATURES', 'x11', '${PN}-x11', '', d)}" 34PACKAGES =+ "${PN}-lib ${PN}-systemd"
35 35
36FILES_${PN}-x11 = "${bindir}/dbus-launch" 36# for compatibility
37RDEPENDS_${PN}-x11 = "${PN}" 37RPROVIDES_${PN} = "dbus-x11"
38RREPLACES_${PN} += "dbus-x11"
38 39
39FILES_${PN}-systemd = "${systemd_unitdir}/system/" 40FILES_${PN}-systemd = "${systemd_unitdir}/system/"
40 41
@@ -43,6 +44,7 @@ FILES_${PN} = "${bindir}/dbus-daemon* \
43 ${bindir}/dbus-cleanup-sockets \ 44 ${bindir}/dbus-cleanup-sockets \
44 ${bindir}/dbus-send \ 45 ${bindir}/dbus-send \
45 ${bindir}/dbus-monitor \ 46 ${bindir}/dbus-monitor \
47 ${bindir}/dbus-launch \
46 ${libexecdir}/dbus* \ 48 ${libexecdir}/dbus* \
47 ${sysconfdir} \ 49 ${sysconfdir} \
48 ${localstatedir} \ 50 ${localstatedir} \
@@ -59,7 +61,7 @@ pkg_postinst_dbus() {
59} 61}
60 62
61EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" 63EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
62EXTRA_OECONF_X_virtclass-native = "--without-x" 64EXTRA_OECONF_X_virtclass-native = "--disable-x11-autolaunch"
63 65
64EXTRA_OECONF = "--disable-tests \ 66EXTRA_OECONF = "--disable-tests \
65 --disable-checks \ 67 --disable-checks \