[PATCH 0/2] Some multilib fixings

[PATCH 0/2] Some multilib fixings

[Lianhao Lu]

This is some multilib fixings for Yocto bug #2216.

The following changes since commit 3e4562500956550dbae5467a5fe9289f1d32f775:
  Saul Wold (1):
        self-hosted-image: Increase space for build and allow builder user sudo access

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib llu/multilib
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=llu/multilib

Lianhao Lu (2):
  package_ipk.bbclass: fixing muttilib prefix extracting.
  connman: Fixed multilib support.

 meta/classes/package_ipk.bbclass                  |    4 ++--
 meta/recipes-connectivity/connman/connman.inc     |    3 ++-
 meta/recipes-connectivity/connman/connman_0.79.bb |    1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

[PATCH 1/2] package_ipk.bbclass: fixing muttilib prefix extracting.

[Lianhao Lu]

Fixed an error in multilib prefix extracting.

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
---
 meta/classes/package_ipk.bbclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index e4a217b..b3560cf 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -74,7 +74,7 @@ package_tryout_install_multilib_ipk() {
 		local pkgname_prefix="${item}-"
 		local pkgname_len=${#pkgname_prefix}
 		for pkg in ${INSTALL_PACKAGES_MULTILIB_IPK}; do
-			local pkgname=$(echo $pkg | awk -v var=$pkgname_len '{ pkgname=substr($1, 1, var - 1); print pkgname; }' )
+			local pkgname=$(echo $pkg | awk -v var=$pkgname_len '{ pkgname=substr($1, 1, var); print pkgname; }' )
 			if [ ${pkgname} = ${pkgname_prefix} ]; then
 			    selected_pkg="${selected_pkg} ${pkg}"
 			fi
@@ -97,7 +97,7 @@ split_multilib_packages() {
 		for item in ${MULTILIB_VARIANTS}; do
 			local pkgname_prefix="${item}-"
 			local pkgname_len=${#pkgname_prefix}
-			local pkgname=$(echo $pkg | awk -v var=$pkgname_len '{ pkgname=substr($1, 1, var - 1); print pkgname; }' )
+			local pkgname=$(echo $pkg | awk -v var=$pkgname_len '{ pkgname=substr($1, 1, var); print pkgname; }' )
 			if [ ${pkgname} = ${pkgname_prefix} ]; then
 				is_multilib=1
 				break
-- 
1.7.0.4

[PATCH 2/2] connman: Fixed multilib support.

[Lianhao Lu]

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@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 \
             "
 
 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"
 
 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"
-- 
1.7.0.4

Re: [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@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"

Re: [PATCH 0/2] Some multilib fixings

[Saul Wold]

On 04/05/2012 04:49 AM, Lianhao Lu wrote:
> This is some multilib fixings for Yocto bug #2216.
>
> The following changes since commit 3e4562500956550dbae5467a5fe9289f1d32f775:
>    Saul Wold (1):
>          self-hosted-image: Increase space for build and allow builder user sudo access
>
> are available in the git repository at:
>
>    git://git.yoctoproject.org/poky-contrib llu/multilib
>    http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=llu/multilib
>
> Lianhao Lu (2):
>    package_ipk.bbclass: fixing muttilib prefix extracting.
>    connman: Fixed multilib support.
>
>   meta/classes/package_ipk.bbclass                  |    4 ++--
>   meta/recipes-connectivity/connman/connman.inc     |    3 ++-
>   meta/recipes-connectivity/connman/connman_0.79.bb |    1 +
>   3 files changed, 5 insertions(+), 3 deletions(-)
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Merged into OE-Core with tweak to remove the ofono DEPENDS

Sau!

Re: [PATCH 2/2] connman: Fixed multilib support.

[Lu, Lianhao]

Saul Wold wrote on 2012-04-06:
> 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@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?

connman-plugin-ofono is RDEPENDS on ofono. 
I put ofono here just like the bluez4 depends to make sure ofono package is generated. Maybe I should use
do_package[depends] = "ofono:do_package" instead of putting it in the misleading DEPENDS.

-Lianhao

>>   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"