Patchwork connman: Fix EXTRA_OECONF

login
register
mail settings
Submitter Shakeel, Muhammad
Date Sept. 13, 2013, 11:50 a.m.
Message ID <1379073002-19032-1-git-send-email-muhammad_shakeel@mentor.com>
Download mbox | patch
Permalink /patch/57957/
State New
Headers show

Comments

Shakeel, Muhammad - Sept. 13, 2013, 11:50 a.m.
From: Muhammad Shakeel <muhammad_shakeel@mentor.com>

- --enable-threads and --enable-fake are obsolete, unrecognized options
now.
- --enable-bluetooth,wifi,ofono just build these technologies as plugins
and these plugins need to be installed explicitly. Our intention here
is to make these technologies available by default, if enabled. For
this we need --enable-bluetooth,wifi,ofono=builtin.
- If bluetooth is getting disabled then disable dundee as well, which
is enabled by default.

Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
---
 meta/recipes-connectivity/connman/connman.inc |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
Jukka Rissanen - Sept. 13, 2013, 12:56 p.m.
Hi Muhammad,

On 13.09.2013 14:50, Shakeel, Muhammad wrote:
> From: Muhammad Shakeel <muhammad_shakeel@mentor.com>
>
> - --enable-threads and --enable-fake are obsolete, unrecognized options
> now.
> - --enable-bluetooth,wifi,ofono just build these technologies as plugins
> and these plugins need to be installed explicitly. Our intention here
> is to make these technologies available by default, if enabled. For
> this we need --enable-bluetooth,wifi,ofono=builtin.
> - If bluetooth is getting disabled then disable dundee as well, which
> is enabled by default.
>
> Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
> ---
>   meta/recipes-connectivity/connman/connman.inc |    8 +++-----
>   1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
> index 37ce3ec..71ecce2 100644
> --- a/meta/recipes-connectivity/connman/connman.inc
> +++ b/meta/recipes-connectivity/connman/connman.inc
> @@ -21,14 +21,12 @@ EXTRA_OECONF += "\
>       ac_cv_path_WPASUPPLICANT=${sbindir}/wpa_supplicant \
>       ac_cv_path_PPPD=${sbindir}/pppd \
>       --enable-debug \
> -    --enable-threads \
>       --enable-loopback \
>       --enable-ethernet \
>       --enable-tools \
>       --enable-test \
>       --disable-polkit \
>       --enable-client \
> -    --enable-fake \

Ack to this part, those options can be removed.

>       ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \
>   "
>
> @@ -42,9 +40,9 @@ PACKAGECONFIG ??= "wispr \
>   # local.conf or distro config
>   # PACKAGECONFIG_append_pn-connman = " openvpn vpnc l2tp pptp"
>
> -PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant"
> -PACKAGECONFIG[bluetooth] = "--enable-bluetooth, --disable-bluetooth, bluez4"
> -PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono"
> +PACKAGECONFIG[wifi] = "--enable-wifi=builtin, --disable-wifi, wpa-supplicant"
> +PACKAGECONFIG[bluetooth] = "--enable-bluetooth=builtin, --disable-bluetooth --disable-dundee, bluez4"
> +PACKAGECONFIG[3g] = "--enable-ofono=builtin, --disable-ofono, ofono"

There is no need to say builtin here as that is the default and those 
plugins are always builtin anyways.

About the dundee disabling, it would probably be better to have this 
check in upstream connman. This would mean that if bluetooth is 
disabled, then dundee would be automatically disabled (tweak 
Makefile.plugins in ConnMan).
Could you send patch for this to connman ml?


>   PACKAGECONFIG[tist] = "--enable-tist,--disable-tist,"
>   PACKAGECONFIG[openvpn] = "--enable-openvpn --with-openvpn=${sbindir}/openvpn,--disable-openvpn,,openvpn"
>   PACKAGECONFIG[vpnc] = "--enable-vpnc --with-vpnc=${sbindir}/vpnc,--disable-vpnc,,vpnc"
>


Cheers,
Jukka
Shakeel, Muhammad - Sept. 13, 2013, 2:59 p.m.
On 09/13/2013 05:56 PM, Jukka Rissanen wrote:
> Hi Muhammad,
>
> On 13.09.2013 14:50, Shakeel, Muhammad wrote:
>> From: Muhammad Shakeel <muhammad_shakeel@mentor.com>
>>
>> - --enable-threads and --enable-fake are obsolete, unrecognized options
>> now.
>> - --enable-bluetooth,wifi,ofono just build these technologies as plugins
>> and these plugins need to be installed explicitly. Our intention here
>> is to make these technologies available by default, if enabled. For
>> this we need --enable-bluetooth,wifi,ofono=builtin.
>> - If bluetooth is getting disabled then disable dundee as well, which
>> is enabled by default.
>>
>> Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
>> ---
>>   meta/recipes-connectivity/connman/connman.inc |    8 +++-----
>>   1 file changed, 3 insertions(+), 5 deletions(-)
>>
>> diff --git a/meta/recipes-connectivity/connman/connman.inc 
>> b/meta/recipes-connectivity/connman/connman.inc
>> index 37ce3ec..71ecce2 100644
>> --- a/meta/recipes-connectivity/connman/connman.inc
>> +++ b/meta/recipes-connectivity/connman/connman.inc
>> @@ -21,14 +21,12 @@ EXTRA_OECONF += "\
>>       ac_cv_path_WPASUPPLICANT=${sbindir}/wpa_supplicant \
>>       ac_cv_path_PPPD=${sbindir}/pppd \
>>       --enable-debug \
>> -    --enable-threads \
>>       --enable-loopback \
>>       --enable-ethernet \
>>       --enable-tools \
>>       --enable-test \
>>       --disable-polkit \
>>       --enable-client \
>> -    --enable-fake \
>
> Ack to this part, those options can be removed.
>
>>       ${@base_contains('DISTRO_FEATURES', 'systemd', 
>> '--with-systemdunitdir=${systemd_unitdir}/system/', 
>> '--with-systemdunitdir=', d)} \
>>   "
>>
>> @@ -42,9 +40,9 @@ PACKAGECONFIG ??= "wispr \
>>   # local.conf or distro config
>>   # PACKAGECONFIG_append_pn-connman = " openvpn vpnc l2tp pptp"
>>
>> -PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant"
>> -PACKAGECONFIG[bluetooth] = "--enable-bluetooth, --disable-bluetooth, 
>> bluez4"
>> -PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono"
>> +PACKAGECONFIG[wifi] = "--enable-wifi=builtin, --disable-wifi, 
>> wpa-supplicant"
>> +PACKAGECONFIG[bluetooth] = "--enable-bluetooth=builtin, 
>> --disable-bluetooth --disable-dundee, bluez4"
>> +PACKAGECONFIG[3g] = "--enable-ofono=builtin, --disable-ofono, ofono"
>
> There is no need to say builtin here as that is the default and those 
> plugins are always builtin anyways.
>
Hi Jukka,
I did this change because I was trying to enable wifi, bluetooth and 
ofono through connman and I was getting this (for all these options):
connmanctl> enable ofono
Error ofono: Method "SetProperty" with signature "sv" on interface 
"net.connman.Technology" doesn't exist

I shared this on connman channel and what I got from there was:
"connman plugins have not been installed. if you do --enable-bluetooth, 
bluetooth functionality is built as plugins and these plugins need to be 
installed. if you do --enable-bluetooth=builtin, the functionality is 
built into connman. if you specify nothing (as there is no reason to 
specify anything anyway), the functionality will be built into connman"

and --enable-*=builtin worked for me. So either we should not mention 
anything or we have to use builtin otherwise (seems more intuitive). Do 
you think it should have worked without builtin and it was something 
else which was incorrect? has anyone else seen this error?

> About the dundee disabling, it would probably be better to have this 
> check in upstream connman. This would mean that if bluetooth is 
> disabled, then dundee would be automatically disabled (tweak 
> Makefile.plugins in ConnMan).
> Could you send patch for this to connman ml?
>
yes, I can do this but we need it for at least this version of connman.
>
>>   PACKAGECONFIG[tist] = "--enable-tist,--disable-tist,"
>>   PACKAGECONFIG[openvpn] = "--enable-openvpn 
>> --with-openvpn=${sbindir}/openvpn,--disable-openvpn,,openvpn"
>>   PACKAGECONFIG[vpnc] = "--enable-vpnc 
>> --with-vpnc=${sbindir}/vpnc,--disable-vpnc,,vpnc"
>>
>
>
> Cheers,
> Jukka
>
Jukka Rissanen - Sept. 16, 2013, 7:21 a.m.
On 13.09.2013 17:59, Muhammad Shakeel wrote:
> On 09/13/2013 05:56 PM, Jukka Rissanen wrote:
>> Hi Muhammad,
>>
>>> -PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant"
>>> -PACKAGECONFIG[bluetooth] = "--enable-bluetooth, --disable-bluetooth,
>>> bluez4"
>>> -PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono"
>>> +PACKAGECONFIG[wifi] = "--enable-wifi=builtin, --disable-wifi,
>>> wpa-supplicant"
>>> +PACKAGECONFIG[bluetooth] = "--enable-bluetooth=builtin,
>>> --disable-bluetooth --disable-dundee, bluez4"
>>> +PACKAGECONFIG[3g] = "--enable-ofono=builtin, --disable-ofono, ofono"
>>
>> There is no need to say builtin here as that is the default and those
>> plugins are always builtin anyways.
>>
> Hi Jukka,
> I did this change because I was trying to enable wifi, bluetooth and
> ofono through connman and I was getting this (for all these options):
> connmanctl> enable ofono
> Error ofono: Method "SetProperty" with signature "sv" on interface
> "net.connman.Technology" doesn't exist

You should have said "enable cellular". Ofono is name of the program, 
and "enable" command expect the name of the technology instead.

The connman commit 55f6589c3298b5cd36032aea98023474513c5b18 (found in 
ConnMan v1.18 or later) introduces technology name completion for the 
"enable" command. So you will see available technologies by pressing TAB 
after the "enable" command.

>
> I shared this on connman channel and what I got from there was:
> "connman plugins have not been installed. if you do --enable-bluetooth,
> bluetooth functionality is built as plugins and these plugins need to be
> installed. if you do --enable-bluetooth=builtin, the functionality is
> built into connman. if you specify nothing (as there is no reason to
> specify anything anyway), the functionality will be built into connman"
>
> and --enable-*=builtin worked for me. So either we should not mention
> anything or we have to use builtin otherwise (seems more intuitive). Do
> you think it should have worked without builtin and it was something
> else which was incorrect? has anyone else seen this error?

having --enable-bluetooth=builtin will have the same effect as 
--enable-bluetooth i.e., the builtin is optional and it is also the 
default value for bluetooth, wifi, ofono and dundee plugins (see ConnMan 
sources Makefile.plugins file and look for builtin modules).

So this part of the patch has no effect on functinality as those plugins 
are builtin already.


Cheers,
Jukka

Patch

diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 37ce3ec..71ecce2 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -21,14 +21,12 @@  EXTRA_OECONF += "\
     ac_cv_path_WPASUPPLICANT=${sbindir}/wpa_supplicant \
     ac_cv_path_PPPD=${sbindir}/pppd \
     --enable-debug \
-    --enable-threads \
     --enable-loopback \
     --enable-ethernet \
     --enable-tools \
     --enable-test \
     --disable-polkit \
     --enable-client \
-    --enable-fake \
     ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \
 "
 
@@ -42,9 +40,9 @@  PACKAGECONFIG ??= "wispr \
 # local.conf or distro config
 # PACKAGECONFIG_append_pn-connman = " openvpn vpnc l2tp pptp"
 
-PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant"
-PACKAGECONFIG[bluetooth] = "--enable-bluetooth, --disable-bluetooth, bluez4"
-PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono"
+PACKAGECONFIG[wifi] = "--enable-wifi=builtin, --disable-wifi, wpa-supplicant"
+PACKAGECONFIG[bluetooth] = "--enable-bluetooth=builtin, --disable-bluetooth --disable-dundee, bluez4"
+PACKAGECONFIG[3g] = "--enable-ofono=builtin, --disable-ofono, ofono"
 PACKAGECONFIG[tist] = "--enable-tist,--disable-tist,"
 PACKAGECONFIG[openvpn] = "--enable-openvpn --with-openvpn=${sbindir}/openvpn,--disable-openvpn,,openvpn"
 PACKAGECONFIG[vpnc] = "--enable-vpnc --with-vpnc=${sbindir}/vpnc,--disable-vpnc,,vpnc"