Patchwork libpcap.inc: Add PACKAGECONFIG support for bluez

login
register
mail settings
Submitter Florin Sarbu
Date April 1, 2014, 10:16 a.m.
Message ID <1396347400-9699-1-git-send-email-florin.sarbu@windriver.com>
Download mbox | patch
Permalink /patch/69815/
State New
Headers show

Comments

Florin Sarbu - April 1, 2014, 10:16 a.m.
This patch adds support for having bluez5 in PACKAGECONFIG
and get libpcap DEPEND on bluez5.

Signed-off-by: Florin Sarbu <florin.sarbu@windriver.com>
---
 meta/recipes-connectivity/libpcap/libpcap.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
Martin Jansa - April 1, 2014, 10:47 a.m.
On Tue, Apr 01, 2014 at 01:16:40PM +0300, Florin Sarbu wrote:
> This patch adds support for having bluez5 in PACKAGECONFIG
> and get libpcap DEPEND on bluez5.
> 
> Signed-off-by: Florin Sarbu <florin.sarbu@windriver.com>
> ---
>  meta/recipes-connectivity/libpcap/libpcap.inc | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc
> index a984e05..1613567 100644
> --- a/meta/recipes-connectivity/libpcap/libpcap.inc
> +++ b/meta/recipes-connectivity/libpcap/libpcap.inc
> @@ -10,8 +10,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867 \
>                      file://pcap.h;beginline=1;endline=34;md5=8d6cf7e17d5745010d633e30bc529ea9"
>  DEPENDS = "flex-native bison-native libnl"
>  
> -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}"
> -PACKAGECONFIG[bluetooth] = "--enable-bluetooth,--disable-bluetooth,bluez4"
> +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)}"
> +PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"
> +PACKAGECONFIG[bluez5] = "--enable-bluetooth,--disable-bluetooth,bluez5"

Does it work correctly?

If you don't enable both you will always get at least one
--disable-bluetooth and depending on order how packageconfigs were
processed it will be disabled or not.

>  PACKAGECONFIG[canusb] = "--enable-canusb,--enable-canusb=no,libusb"
>  PACKAGECONFIG[libnl1] = "--with-libnl,--without-libnl,libnl1,libnl1"
>  
> -- 
> 1.9.1
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
Florin Sarbu - April 1, 2014, 12:58 p.m.
On 04/01/2014 01:47 PM, Martin Jansa wrote:
> On Tue, Apr 01, 2014 at 01:16:40PM +0300, Florin Sarbu wrote:
>> This patch adds support for having bluez5 in PACKAGECONFIG
>> and get libpcap DEPEND on bluez5.
>>
>> Signed-off-by: Florin Sarbu <florin.sarbu@windriver.com>
>> ---
>>   meta/recipes-connectivity/libpcap/libpcap.inc | 5 +++--
>>   1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc
>> index a984e05..1613567 100644
>> --- a/meta/recipes-connectivity/libpcap/libpcap.inc
>> +++ b/meta/recipes-connectivity/libpcap/libpcap.inc
>> @@ -10,8 +10,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867 \
>>                       file://pcap.h;beginline=1;endline=34;md5=8d6cf7e17d5745010d633e30bc529ea9"
>>   DEPENDS = "flex-native bison-native libnl"
>>   
>> -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}"
>> -PACKAGECONFIG[bluetooth] = "--enable-bluetooth,--disable-bluetooth,bluez4"
>> +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)}"
>> +PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"
>> +PACKAGECONFIG[bluez5] = "--enable-bluetooth,--disable-bluetooth,bluez5"
> Does it work correctly?
>
> If you don't enable both you will always get at least one
> --disable-bluetooth and depending on order how packageconfigs were
> processed it will be disabled or not.
>
You are correct, the line:

+PACKAGECONFIG[bluez5] = "--enable-bluetooth,--disable-bluetooth,bluez5"

should be:


+PACKAGECONFIG[bluez5] = "--enable-bluetooth,,bluez5"


to get it to work as expected until bluez5 is replacing entirely bluez4.

Florin

>>   PACKAGECONFIG[canusb] = "--enable-canusb,--enable-canusb=no,libusb"
>>   PACKAGECONFIG[libnl1] = "--with-libnl,--without-libnl,libnl1,libnl1"
>>   
>> -- 
>> 1.9.1
>>
>> -- 
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc
index a984e05..1613567 100644
--- a/meta/recipes-connectivity/libpcap/libpcap.inc
+++ b/meta/recipes-connectivity/libpcap/libpcap.inc
@@ -10,8 +10,9 @@  LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867 \
                     file://pcap.h;beginline=1;endline=34;md5=8d6cf7e17d5745010d633e30bc529ea9"
 DEPENDS = "flex-native bison-native libnl"
 
-PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}"
-PACKAGECONFIG[bluetooth] = "--enable-bluetooth,--disable-bluetooth,bluez4"
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)}"
+PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"
+PACKAGECONFIG[bluez5] = "--enable-bluetooth,--disable-bluetooth,bluez5"
 PACKAGECONFIG[canusb] = "--enable-canusb,--enable-canusb=no,libusb"
 PACKAGECONFIG[libnl1] = "--with-libnl,--without-libnl,libnl1,libnl1"