[OE-core] [oe-commits] Radu Moisan : dbus: include dbus-launch in the main dbus package

[Radu Moisan]

Could not get rid of PREFERRED_PROVIDER warning. Tried different 
variations but the warning remains there every time. Can you give me 
some hint about PREFERRED_PROVIDER usage?

Thanks,
Radu

On 07/31/2012 04:22 PM, Martin Jansa wrote:
> On Tue, Jul 31, 2012 at 11:02:42AM +0000, git at git.openembedded.org wrote:
>> Module: openembedded-core.git
>> Branch: master
>> Commit: c02364f36e228835ea5d7fd4e1d347fd451f8544
>> URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c02364f36e228835ea5d7fd4e1d347fd451f8544
>>
>> Author: Radu Moisan <radu.moisan at intel.com>
>> Date:   Tue Jul 31 09:23:23 2012 +0300
>>
>> 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.
> 5) create new warning:
> NOTE: multiple providers are available for runtime dbus-x11 (dbus, dbus-nativesdk)
> NOTE: consider defining a PREFERRED_PROVIDER entry to match dbus-x11
>
> Cheers,
>
>> Fixes [Yocto #2261]
>>
>> Signed-off-by: Radu Moisan <radu.moisan at intel.com>
>> Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
>>
>> ---
>>
>>   meta/recipes-core/dbus/dbus.inc |   10 ++++++----
>>   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 \
>>
>>
>> _______________________________________________
>> Openembedded-commits mailing list
>> Openembedded-commits at lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20120801/f9e5002e/attachment-0002.html>