aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRadu Moisan <radu.moisan@intel.com>2012-07-31 06:23:23 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-31 10:59:06 (GMT)
commitf8d40ab395ffb8ed12731e318354fb3d30447e84 (patch)
tree596b30fa9f3047ad6e9ac4f3b5295de80a0df3a1
parentc5d8b0b9d97c7a4c3a71713708b97d1f1b917c12 (diff)
downloadpoky-f8d40ab395ffb8ed12731e318354fb3d30447e84.zip
poky-f8d40ab395ffb8ed12731e318354fb3d30447e84.tar.gz
poky-f8d40ab395ffb8ed12731e318354fb3d30447e84.tar.bz2
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: c02364f36e228835ea5d7fd4e1d347fd451f8544) Signed-off-by: Radu Moisan <radu.moisan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 a75583d..164c4d3 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 \