Patchwork [V2,1/1] connman: optionally build ofono plugin.

login
register
mail settings
Submitter Lianhao Lu
Date April 10, 2012, 3:16 a.m.
Message ID <0953244152d03d27f6c60729c58484af81f95a1d.1334027369.git.lianhao.lu@intel.com>
Download mbox | patch
Permalink /patch/25483/
State New
Headers show

Comments

Lianhao Lu - April 10, 2012, 3:16 a.m.
Only build ofono plugin when 3g feature is enabled. Also add dependency
to ofono when ofono plugin is being built.

This is part of the buf fixing [YOCTO #2216].

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
---
 meta/recipes-connectivity/connman/connman.inc |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
Koen Kooi - April 10, 2012, 6:48 a.m.
This changes the default behaviour, so it should not go in for 1.2

Op 10 apr. 2012, om 05:16 heeft Lianhao Lu het volgende geschreven:

> Only build ofono plugin when 3g feature is enabled. Also add dependency
> to ofono when ofono plugin is being built.
> 
> This is part of the buf fixing [YOCTO #2216].
> 
> Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
> ---
> meta/recipes-connectivity/connman/connman.inc |    3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
> index 1a6dd1b..c3827f1 100644
> --- a/meta/recipes-connectivity/connman/connman.inc
> +++ b/meta/recipes-connectivity/connman/connman.inc
> @@ -17,6 +17,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
> DEPENDS  = "dbus glib-2.0 ppp iptables gnutls \
>             ${@base_contains('DISTRO_FEATURES', 'bluetooth','bluez4', '', d)} \
>             ${@base_contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \
> +            ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
>             "
> 
> EXTRA_OECONF += "\
> @@ -30,7 +31,7 @@ EXTRA_OECONF += "\
>     ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi', '--disable-wifi', d)} \
>     ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
>     --enable-dnsproxy \
> -    --enable-ofono \
> +    ${@base_contains('DISTRO_FEATURES', '3g','--enable-ofono', '--disable-ofono', d)} \
>     --enable-tools \
>     --enable-test \
>     --disable-polkit \
> -- 
> 1.7.0.4
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Otavio Salvador - April 10, 2012, 11:18 a.m.
Hello Koen,

On Tue, Apr 10, 2012 at 03:48, Koen Kooi <koen@dominion.thruhere.net> wrote:
> This changes the default behaviour, so it should not go in for 1.2

I don't see why this shouldn't be included. It does improve build time
and works for both OE-Core and Yocto setups.

Can you clarify what is your concerns?
Koen Kooi - April 10, 2012, 11:24 a.m.
Op 10 apr. 2012, om 13:18 heeft Otavio Salvador het volgende geschreven:

> Hello Koen,
> 
> On Tue, Apr 10, 2012 at 03:48, Koen Kooi <koen@dominion.thruhere.net> wrote:
>> This changes the default behaviour, so it should not go in for 1.2
> 
> I don't see why this shouldn't be included. It does improve build time
> and works for both OE-Core and Yocto setups.
> 
> Can you clarify what is your concerns?

It changes the default behaviour. There shouldn't be any behaviour changes so late in the release cycle.
And apart from that, it should use PACKAGECONFIG :)
Otavio Salvador - April 10, 2012, 11:27 a.m.
On Tue, Apr 10, 2012 at 08:24, Koen Kooi <koen@dominion.thruhere.net> wrote:
>> Can you clarify what is your concerns?
>
> It changes the default behaviour. There shouldn't be any behaviour changes so late in the release cycle.
> And apart from that, it should use PACKAGECONFIG :)

I agree about PACKAGECONFIG but this behaviour change seems acceptable
for me since most users won't  be using 3g and will be not affected by
this.
Richard Purdie - April 10, 2012, 12:08 p.m.
On Tue, 2012-04-10 at 08:27 -0300, Otavio Salvador wrote:
> On Tue, Apr 10, 2012 at 08:24, Koen Kooi <koen@dominion.thruhere.net> wrote:
> >> Can you clarify what is your concerns?
> >
> > It changes the default behaviour. There shouldn't be any behaviour changes so late in the release cycle.
> > And apart from that, it should use PACKAGECONFIG :)
> 
> I agree about PACKAGECONFIG but this behaviour change seems acceptable
> for me since most users won't  be using 3g and will be not affected by
> this.

So how about we just add ophono to DEPENDS for 1.2 (since its implied
and enabled as things stand) and then in 1.3 we use PACKAGECONFIG?

Cheers,

Richard
Koen Kooi - April 10, 2012, 12:43 p.m.
Op 10 apr. 2012, om 14:08 heeft Richard Purdie het volgende geschreven:

> On Tue, 2012-04-10 at 08:27 -0300, Otavio Salvador wrote:
>> On Tue, Apr 10, 2012 at 08:24, Koen Kooi <koen@dominion.thruhere.net> wrote:
>>>> Can you clarify what is your concerns?
>>> 
>>> It changes the default behaviour. There shouldn't be any behaviour changes so late in the release cycle.
>>> And apart from that, it should use PACKAGECONFIG :)
>> 
>> I agree about PACKAGECONFIG but this behaviour change seems acceptable
>> for me since most users won't  be using 3g and will be not affected by
>> this.
> 
> So how about we just add ophono to DEPENDS for 1.2 (since its implied
> and enabled as things stand) and then in 1.3 we use PACKAGECONFIG?

That works for me.

regards,

koen

Patch

diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 1a6dd1b..c3827f1 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -17,6 +17,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
 DEPENDS  = "dbus glib-2.0 ppp iptables gnutls \
             ${@base_contains('DISTRO_FEATURES', 'bluetooth','bluez4', '', d)} \
             ${@base_contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \
+            ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
             "
 
 EXTRA_OECONF += "\
@@ -30,7 +31,7 @@  EXTRA_OECONF += "\
     ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi', '--disable-wifi', d)} \
     ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
     --enable-dnsproxy \
-    --enable-ofono \
+    ${@base_contains('DISTRO_FEATURES', '3g','--enable-ofono', '--disable-ofono', d)} \
     --enable-tools \
     --enable-test \
     --disable-polkit \