From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com ([143.182.124.21]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1SuOFs-0000HF-Fe for openembedded-core@lists.openembedded.org; Thu, 26 Jul 2012 15:37:28 +0200 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 26 Jul 2012 06:25:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.71,315,1320652800"; d="scan'208";a="173472468" Received: from dell-desktop (HELO localhost.localdomain) ([10.237.105.32]) by azsmga001.ch.intel.com with ESMTP; 26 Jul 2012 06:25:55 -0700 From: Radu Moisan To: openembedded-core@lists.openembedded.org Date: Thu, 26 Jul 2012 16:27:12 +0300 Message-Id: <1343309232-23680-1-git-send-email-radu.moisan@intel.com> X-Mailer: git-send-email 1.7.9.5 Subject: [PATCH v4] dbus: include dbus-launch in the main dbus package X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jul 2012 13:37:28 -0000 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 --- meta/recipes-core/dbus/dbus.inc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index a75583d..83299c4 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} \ @@ -58,8 +61,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