Patchwork connman: make tist functionallity a PACKAGECONFIG option

login
register
mail settings
Submitter ml@communistcode.co.uk
Date April 26, 2013, 10:06 a.m.
Message ID <1366970771-9959-1-git-send-email-ml@communistcode.co.uk>
Download mbox | patch
Permalink /patch/48927/
State New
Headers show

Comments

ml@communistcode.co.uk - April 26, 2013, 10:06 a.m.
From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>

Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
---

Runtime tested on beaglebone armv7a, with and without tist PACKAGECONFIG

 meta/recipes-connectivity/connman/connman.inc | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
Martin Jansa - April 26, 2013, 10:16 a.m.
On Fri, Apr 26, 2013 at 11:06:11AM +0100, Jack Mitchell wrote:
> From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
> 
> Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
> ---
> 
> Runtime tested on beaglebone armv7a, with and without tist PACKAGECONFIG
> 
>  meta/recipes-connectivity/connman/connman.inc | 13 +++++++------
>  1 file changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
> index 589ece8..eb9d145 100644
> --- a/meta/recipes-connectivity/connman/connman.inc
> +++ b/meta/recipes-connectivity/connman/connman.inc
> @@ -20,10 +20,7 @@ DEPENDS  = "dbus glib-2.0 ppp iptables gnutls \
>              ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
>              "
>  
> -INC_PR = "r19"
> -
> -TIST = "--enable-tist"
> -TIST_powerpc = ""
> +INC_PR = "r20"
>  
>  EXTRA_OECONF += "\
>      ac_cv_path_WPASUPPLICANT=${sbindir}/wpa_supplicant \
> @@ -32,8 +29,8 @@ EXTRA_OECONF += "\
>      --enable-threads \
>      --enable-loopback \
>      --enable-ethernet \
> -    ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi ${TIST}', '--disable-wifi', d)} \
> -    ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth ${TIST}', '--disable-bluetooth', d)} \
> +    ${@base_contains('DISTRO_FEATURES', 'wifi', '--enable-wifi', '--disable-wifi', d)} \
> +    ${@base_contains('DISTRO_FEATURES', 'bluetooth', '--enable-bluetooth', '--disable-bluetooth', d)} \
>      ${@base_contains('DISTRO_FEATURES', '3g', '--enable-ofono', '--disable-ofono', d)} \
>      --enable-tools \
>      --enable-test \
> @@ -43,6 +40,10 @@ EXTRA_OECONF += "\
>      ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \
>  "
>  
> +PACKAGECONFIG ??= ""
> +
> +PACKAGECONFIG[tist] = "--enable-tist,,"

would you mind to convert wifi, bluetooth and 3g also to PACKAGECONFIGs?

> +
>  INITSCRIPT_NAME = "connman"
>  INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ."
>  
> -- 
> 1.8.2.1
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
ml@communistcode.co.uk - April 26, 2013, 10:26 a.m.
On 26/04/13 11:16, Martin Jansa wrote:
> On Fri, Apr 26, 2013 at 11:06:11AM +0100, Jack Mitchell wrote:
>> From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
>>
>> Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
>> ---
>>
>> Runtime tested on beaglebone armv7a, with and without tist PACKAGECONFIG
>>
>>   meta/recipes-connectivity/connman/connman.inc | 13 +++++++------
>>   1 file changed, 7 insertions(+), 6 deletions(-)
>>
>> diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
>> index 589ece8..eb9d145 100644
>> --- a/meta/recipes-connectivity/connman/connman.inc
>> +++ b/meta/recipes-connectivity/connman/connman.inc
>> @@ -20,10 +20,7 @@ DEPENDS  = "dbus glib-2.0 ppp iptables gnutls \
>>               ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
>>               "
>>   
>> -INC_PR = "r19"
>> -
>> -TIST = "--enable-tist"
>> -TIST_powerpc = ""
>> +INC_PR = "r20"
>>   
>>   EXTRA_OECONF += "\
>>       ac_cv_path_WPASUPPLICANT=${sbindir}/wpa_supplicant \
>> @@ -32,8 +29,8 @@ EXTRA_OECONF += "\
>>       --enable-threads \
>>       --enable-loopback \
>>       --enable-ethernet \
>> -    ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi ${TIST}', '--disable-wifi', d)} \
>> -    ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth ${TIST}', '--disable-bluetooth', d)} \
>> +    ${@base_contains('DISTRO_FEATURES', 'wifi', '--enable-wifi', '--disable-wifi', d)} \
>> +    ${@base_contains('DISTRO_FEATURES', 'bluetooth', '--enable-bluetooth', '--disable-bluetooth', d)} \
>>       ${@base_contains('DISTRO_FEATURES', '3g', '--enable-ofono', '--disable-ofono', d)} \
>>       --enable-tools \
>>       --enable-test \
>> @@ -43,6 +40,10 @@ EXTRA_OECONF += "\
>>       ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \
>>   "
>>   
>> +PACKAGECONFIG ??= ""
>> +
>> +PACKAGECONFIG[tist] = "--enable-tist,,"
> would you mind to convert wifi, bluetooth and 3g also to PACKAGECONFIGs?
>
>> +
>>   INITSCRIPT_NAME = "connman"
>>   INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ."
>>   
>> -- 
>> 1.8.2.1
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Something like:

PACKAGECONFIG ??= " \
${@base_contains('DISTRO_FEATURES', 'wifi','wifi', '', d)}\
                   "

PACKAGECONFIG[wifi] = "--enable-wifi,--disable-wifi,"


Or were you thinking of another method?
Ross Burton - April 26, 2013, 10:37 a.m.
On 26 April 2013 11:26, Jack Mitchell <ml@communistcode.co.uk> wrote:
> Something like:
>
> PACKAGECONFIG ??= " \
> ${@base_contains('DISTRO_FEATURES', 'wifi','wifi', '', d)}\
>                   "
>
> PACKAGECONFIG[wifi] = "--enable-wifi,--disable-wifi,"
>
> Or were you thinking of another method?

That's right.  Would be nice if we had a more concise method, but
that's idiomatic at least.

Ross

Patch

diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 589ece8..eb9d145 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -20,10 +20,7 @@  DEPENDS  = "dbus glib-2.0 ppp iptables gnutls \
             ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
             "
 
-INC_PR = "r19"
-
-TIST = "--enable-tist"
-TIST_powerpc = ""
+INC_PR = "r20"
 
 EXTRA_OECONF += "\
     ac_cv_path_WPASUPPLICANT=${sbindir}/wpa_supplicant \
@@ -32,8 +29,8 @@  EXTRA_OECONF += "\
     --enable-threads \
     --enable-loopback \
     --enable-ethernet \
-    ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi ${TIST}', '--disable-wifi', d)} \
-    ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth ${TIST}', '--disable-bluetooth', d)} \
+    ${@base_contains('DISTRO_FEATURES', 'wifi', '--enable-wifi', '--disable-wifi', d)} \
+    ${@base_contains('DISTRO_FEATURES', 'bluetooth', '--enable-bluetooth', '--disable-bluetooth', d)} \
     ${@base_contains('DISTRO_FEATURES', '3g', '--enable-ofono', '--disable-ofono', d)} \
     --enable-tools \
     --enable-test \
@@ -43,6 +40,10 @@  EXTRA_OECONF += "\
     ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \
 "
 
+PACKAGECONFIG ??= ""
+
+PACKAGECONFIG[tist] = "--enable-tist,,"
+
 INITSCRIPT_NAME = "connman"
 INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ."