| Submitter | Radu Moisan |
|---|---|
| Date | July 30, 2012, 11:24 a.m. |
| Message ID | <1343647468-25684-1-git-send-email-radu.moisan@intel.com> |
| Download | mbox | patch |
| Permalink | /patch/33285/ |
| State | New |
| Headers | show |
Comments
On 30 July 2012 12:24, Radu Moisan <radu.moisan@intel.com> wrote:
> +PROVIDES = "dbus-x11"
The provides that provide comparability were RPROVIDES/RREPLACES, this
doesn't do anything because nothing should be DEPENDing on dbus-x11,
so you can remove it.
Ross
this is what my intention was as well, but nobody confirmed when I asked about it. I'll prepare another patch. Radu On 07/30/2012 06:07 PM, Burton, Ross wrote: > On 30 July 2012 12:24, Radu Moisan <radu.moisan@intel.com> wrote: >> +PROVIDES = "dbus-x11" > The provides that provide comparability were RPROVIDES/RREPLACES, this > doesn't do anything because nothing should be DEPENDing on dbus-x11, > so you can remove it. > > Ross > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Patch
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index a75583d..8a9edaa 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} \ @@ -59,7 +62,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 \
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] Signed-off-by: Radu Moisan <radu.moisan@intel.com> --- meta/recipes-core/dbus/dbus.inc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)