[OE-core] [PATCH 2/2] connman: Fixed multilib support.

[Saul Wold]

On 04/05/2012 04:49 AM, Lianhao Lu wrote:
> 1. Added static depends to ofono.
> 2. Corrected the package content of connman-test.
>
> This is part of the bug fixing [YOCTO #2216].
>
> Signed-off-by: Lianhao Lu<lianhao.lu at intel.com>
> ---
>   meta/recipes-connectivity/connman/connman.inc     |    3 ++-
>   meta/recipes-connectivity/connman/connman_0.79.bb |    1 +
>   2 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
> index d9d663c..bfe6620 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)} \
> +            ofono \
>               "
>
Why is this needed here?

>   EXTRA_OECONF += "\
> @@ -90,7 +91,7 @@ PACKAGES =+ "${PN}-tools ${PN}-tests"
>
>   FILES_${PN}-tools = "${bindir}/wispr"
>
> -FILES_${PN}-tests = "${bindir}/*-test ${libdir}/${PN}/test/*"
> +FILES_${PN}-tests = "${bindir}/*-test ${libdir}/${BPN}/test/*"
>   RDEPENDS_${PN}-tests = "python-dbus"
>
I tweaked your patch to just take this multilib bits.

Sau!


>   FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
> diff --git a/meta/recipes-connectivity/connman/connman_0.79.bb b/meta/recipes-connectivity/connman/connman_0.79.bb
> index 0c3a6fe..f87c4dd 100644
> --- a/meta/recipes-connectivity/connman/connman_0.79.bb
> +++ b/meta/recipes-connectivity/connman/connman_0.79.bb
> @@ -8,3 +8,4 @@ SRC_URI  = "git://git.kernel.org/pub/scm/network/connman/connman.git \
>               file://disable_alg-test.patch \
>               file://connman"
>   S = "${WORKDIR}/git"
> +PR = "r1"