From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com ([134.134.136.20]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1SwUXB-0000h5-SH for openembedded-core@lists.openembedded.org; Wed, 01 Aug 2012 10:44:02 +0200 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 01 Aug 2012 01:32:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.67,351,1309762800"; d="scan'208,217";a="180158358" Received: from dell-desktop (HELO [10.237.105.32]) ([10.237.105.32]) by orsmga002.jf.intel.com with ESMTP; 01 Aug 2012 01:32:22 -0700 Message-ID: <5018EA00.2000908@intel.com> Date: Wed, 01 Aug 2012 11:34:08 +0300 From: Radu Moisan User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:14.0) Gecko/20120714 Thunderbird/14.0 MIME-Version: 1.0 To: Patches and discussions about the oe-core layer References: <20120731110242.D424910219@opal> <20120731132257.GW3261@jama.jama.net> <5018E623.5090502@intel.com> <20120801082800.GA16306@jama.jama.net> In-Reply-To: <20120801082800.GA16306@jama.jama.net> Subject: Re: [oe-commits] Radu Moisan : 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: Wed, 01 Aug 2012 08:44:02 -0000 Content-Type: multipart/alternative; boundary="------------000705070401070307020900" --------------000705070401070307020900 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit ok, thanks Martin, I'll give it a shot later today. Radu On 08/01/2012 11:28 AM, Martin Jansa wrote: > On Wed, Aug 01, 2012 at 11:17:39AM +0300, Radu Moisan wrote: >> 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? > It's not problem in configuration, it's bug in dbus metadata > >>> +RPROVIDES_${PN} = "dbus-x11" >>> +RREPLACES_${PN} += "dbus-x11" > should be: > 1) if we don't have anything depending on e.g. dbus-x11-nativesdk then > you can fix that by something like: > RPROVIDES_${PN} = "${PN}-x11" > RREPLACES_${PN} += "${PN}-x11" > which will cause dbus-nativesdk to provide dbus-nativesdk-x11 (which > nobody is interested in). > > 2) but if some package with nativesdk BBCLASSEXTEND have RDEPENDS_${PN} > = "dbus-x11" then you have to append PKGSUFFIX after dbus-x11 not > between dbus and x11. Something like: > PKGSUFFIX = "" > PKGSUFFIX_virtclass-nativesdk = "-nativesdk" > RPROVIDES_${PN} = "dbus-x11${PKGSUFFIX}" > RREPLACES_${PN} += dbus-x11${PKGSUFFIX}" > > Cheers, > >> Thanks, >> Radu >> >> On 07/31/2012 04:22 PM, Martin Jansa wrote: >>> On Tue, Jul 31, 2012 at 11:02:42AM +0000, git@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 >>>> 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 >>>> Signed-off-by: Richard Purdie >>>> >>>> --- >>>> >>>> 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@lists.openembedded.org >>>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits >>> >>> _______________________________________________ >>> Openembedded-core mailing list >>> Openembedded-core@lists.openembedded.org >>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core --------------000705070401070307020900 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit ok, thanks Martin, I'll give it a shot later today.

Radu

On 08/01/2012 11:28 AM, Martin Jansa wrote:
On Wed, Aug 01, 2012 at 11:17:39AM +0300, Radu Moisan wrote:

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?

It's not problem in configuration, it's bug in dbus metadata


+RPROVIDES_${PN} = "dbus-x11"
+RREPLACES_${PN} += "dbus-x11"

should be:
1) if we don't have anything depending on e.g. dbus-x11-nativesdk then
you can fix that by something like:
RPROVIDES_${PN} = "${PN}-x11"
RREPLACES_${PN} += "${PN}-x11"
which will cause dbus-nativesdk to provide dbus-nativesdk-x11 (which
nobody is interested in).

2) but if some package with nativesdk BBCLASSEXTEND have RDEPENDS_${PN}
= "dbus-x11" then you have to append PKGSUFFIX after dbus-x11 not
between dbus and x11. Something like:
PKGSUFFIX = ""
PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
RPROVIDES_${PN} = "dbus-x11${PKGSUFFIX}"
RREPLACES_${PN} += dbus-x11${PKGSUFFIX}"

Cheers,


Thanks,
Radu

On 07/31/2012 04:22 PM, Martin Jansa wrote:

On Tue, Jul 31, 2012 at 11:02:42AM +0000, git@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@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@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@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@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits


_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core


      

      

      

        
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core


      

      



      

      

      

      
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core


    

    

  


--------------000705070401070307020900--