[OE-core] [PATCH] connman.inc: Add PACKAGECONFIG support for bluez5

[Richard Purdie]

On Tue, 2014-04-01 at 13:09 +0300, Florin Sarbu wrote:
> Currently connman can only RDEPEND on bluez4.
> This patch adds support for having bluez5 in PACKAGECONFIG
> and get connman RDEPEND on bluez5 if desired.
> 
> Signed-off-by: Florin Sarbu <florin.sarbu at windriver.com>
> ---
>  meta/recipes-connectivity/connman/connman.inc | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
> index b3147c9..53a6a4f 100644
> --- a/meta/recipes-connectivity/connman/connman.inc
> +++ b/meta/recipes-connectivity/connman/connman.inc
> @@ -32,7 +32,7 @@ EXTRA_OECONF += "\
>  
>  PACKAGECONFIG ??= "wispr \
>                     ${@base_contains('DISTRO_FEATURES', 'wifi','wifi', '', d)} \
> -                   ${@base_contains('DISTRO_FEATURES', 'bluetooth','bluetooth', '', d)} \
> +                   ${@base_contains('DISTRO_FEATURES', 'bluetooth','bluez4', '', d)} \
>                     ${@base_contains('DISTRO_FEATURES', '3g','3g', '', d)} \
>  "
>  
> @@ -42,6 +42,7 @@ PACKAGECONFIG ??= "wispr \
>  
>  PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant"
>  PACKAGECONFIG[bluetooth] = "--enable-bluetooth, --disable-bluetooth, bluez4"

You renamed the option above but didn't here and hence broke bluez4.
This is not the quality of patch expected at -rc time for a release :(.

Cheers,

Richard

> +PACKAGECONFIG[bluez5] = "--enable-bluetooth, --disable-bluetooth, bluez5"
>  PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono"
>  PACKAGECONFIG[tist] = "--enable-tist,--disable-tist,"
>  PACKAGECONFIG[openvpn] = "--enable-openvpn --with-openvpn=${sbindir}/openvpn,--disable-openvpn,,openvpn"
> @@ -114,6 +115,7 @@ RPROVIDES_${PN} = "\
>  RDEPENDS_${PN} = "\
>  	dbus \
>  	${@base_contains('PACKAGECONFIG', 'bluetooth', 'bluez4', '', d)} \
> +	${@base_contains('PACKAGECONFIG', 'bluez5', 'bluez5', '', d)} \
>  	${@base_contains('PACKAGECONFIG', 'wifi','wpa-supplicant', '', d)} \
>  	${@base_contains('PACKAGECONFIG', '3g','ofono', '', d)} \
>  	xuser-account \
> -- 
> 1.9.1
>