Openembedded Core Discussions
 help / color / mirror / Atom feed
* [PATCH v3] dbus: include dbus-launch in the main dbus package
@ 2012-07-26  6:17 Radu Moisan
  2012-07-26  6:29 ` Radu Moisan
  2012-07-26 13:17 ` Enrico Scholz
  0 siblings, 2 replies; 34+ messages in thread
From: Radu Moisan @ 2012-07-26  6:17 UTC (permalink / raw)
  To: openembedded-core

Followed suggestions from Bugz 2261:

1) remove the --with-x/--without-x configure arguments. If you want to force
no-discovery for native builds the correct argument is --disable-x11-autolaunch.
This ensures that DBus looks at the build environment to determine whether to
enable X11 bus discovery or not.

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 <radu.moisan@intel.com>
---
 meta/recipes-core/dbus/dbus.inc |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index a75583d..9559f6f 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -31,10 +31,10 @@ 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
+RREPLACES_${PN} += "dbus-x11"
 
 FILES_${PN}-systemd = "${systemd_unitdir}/system/"
 
@@ -43,6 +43,7 @@ FILES_${PN} = "${bindir}/dbus-daemon* \
                ${bindir}/dbus-cleanup-sockets \
                ${bindir}/dbus-send \
                ${bindir}/dbus-monitor \
+               ${bindir}/dbus-launch \
                ${libexecdir}/dbus* \
                ${sysconfdir} \
                ${localstatedir} \
@@ -58,8 +59,8 @@ pkg_postinst_dbus() {
 	fi
 }
 
-EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
-EXTRA_OECONF_X_virtclass-native = "--without-x"
+EXTRA_OECONF_X = ""
+EXTRA_OECONF_X_virtclass-native = "--disable-x11-autolaunch"
 
 EXTRA_OECONF = "--disable-tests \
                 --disable-checks \
-- 
1.7.9.5




^ permalink raw reply related	[flat|nested] 34+ messages in thread

end of thread, other threads:[~2012-07-27 10:14 UTC | newest]

Thread overview: 34+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-26  6:17 [PATCH v3] dbus: include dbus-launch in the main dbus package Radu Moisan
2012-07-26  6:29 ` Radu Moisan
2012-07-26  8:08   ` Koen Kooi
2012-07-26  8:42     ` Paul Eggleton
2012-07-26  8:43       ` Koen Kooi
2012-07-26  9:18         ` Radu Moisan
2012-07-26  9:51           ` Koen Kooi
2012-07-26 10:23             ` Burton, Ross
2012-07-26 10:36               ` Radu Moisan
2012-07-26 10:31             ` Radu Moisan
2012-07-26 10:55               ` Radu Moisan
2012-07-26 11:27                 ` Burton, Ross
2012-07-26 11:55                   ` Koen Kooi
2012-07-26 12:00                     ` Burton, Ross
2012-07-26 12:29                       ` Koen Kooi
2012-07-26 12:32                         ` Paul Eggleton
2012-07-26 12:38                           ` Koen Kooi
2012-07-26 12:56                             ` Paul Eggleton
2012-07-26 13:06                               ` Radu Moisan
2012-07-26 13:07                               ` Koen Kooi
2012-07-26 13:12                                 ` Paul Eggleton
2012-07-26 13:21                                   ` Koen Kooi
2012-07-26 12:36                       ` Radu Moisan
2012-07-26 12:51                         ` Koen Kooi
2012-07-26 12:59                           ` Radu Moisan
2012-07-26 13:08     ` Enrico Scholz
2012-07-26 13:24       ` Radu Moisan
2012-07-26 14:32         ` Enrico Scholz
2012-07-26 21:14           ` Burton, Ross
2012-07-26 13:17 ` Enrico Scholz
2012-07-26 21:12   ` Burton, Ross
2012-07-27  6:10     ` Radu Moisan
2012-07-27  6:15       ` Radu Moisan
2012-07-27 10:02       ` Burton, Ross

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox