Some multilib fixings

PATCH Applied Lianhao Lu 2 participants 6 messages Apr 5, 2012 – Apr 6, 2012

lore

Share & tools

lore

Lianhao Lu

author

2012-04-05 12:03 UTC #0 lore raw

cover Some multilib fixings

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(-)

Lianhao Lu

author

2012-04-05 12:03 UTC #1 lore raw

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

Fixed an error in multilib prefix extracting.

Signed-off-by Lianhao Lu <[email protected]>

---
 meta/classes/package_ipk.bbclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

meta/classes/package_ipk.bbclass +2 -2

index e4a217b..b3560cf 100644
@@ -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

Signature · 1 line

1.7.0.4

Lianhao Lu

author

2012-04-05 12:03 UTC #2 lore raw

PATCH 2/2 connman: Fixed multilib support.

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 <[email protected]>

---
 meta/recipes-connectivity/connman/connman.inc     |    3 ++-
 meta/recipes-connectivity/connman/connman_0.79.bb |    1 +
 2 files changed, 3 insertions(+), 1 deletions(-)

meta/recipes-connectivity/connman/connman.inc +2 -1

index d9d663c..bfe6620 100644
@@ -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.* \

meta/recipes-connectivity/connman/connman_0.79.bb +1 -0

index 0c3a6fe..f87c4dd 100644
@@ -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"

Signature · 1 line

1.7.0.4

Saul Wold

2012-04-06 03:23 UTC #3 lore raw

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

Quoted 16 lines · 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<[email protected]>
---
  meta/recipes-connectivity/connman/connman.inc     |    3 ++-
  meta/recipes-connectivity/connman/connman_0.79.bb |    1 +
  2 files changed, 3 insertions(+), 1 deletions(-)
meta/recipes-connectivity/connman/connman.inc +0 -0
index d9d663c..bfe6620 100644

meta/recipes-connectivity/connman/connman.inc LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ · line 22

Quoted 6 lines

meta/recipes-connectivity/connman/connman.inc +1 -0

@@ -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?

meta/recipes-connectivity/connman/connman.inc PACKAGES =+ "${PN}-tools ${PN}-tests" · line 96

Quoted 9 lines

meta/recipes-connectivity/connman/connman.inc +1 -1

  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!

Quoted 10 lines

meta/recipes-connectivity/connman/connman.inc +0 -0

  FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \

meta/recipes-connectivity/connman/connman_0.79.bb +1 -0

index 0c3a6fe..f87c4dd 100644
@@ -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"

Lu, Lianhao

author

2012-04-06 03:33 UTC #4 lore raw

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

Saul Wold wrote on 2012-04-06:

Quoted 6 lines · Lianhao Lu

Quoted 5 lines
1. Added static depends to ofono.
2. Corrected the package content of connman-test.
This is part of the bug fixing [YOCTO #2216].

Quoted 15 lines

Quoted 10 lines
Signed-off-by Lianhao Lu<[email protected]>
---
  meta/recipes-connectivity/connman/connman.inc     |    3 ++-
  meta/recipes-connectivity/connman/connman_0.79.bb |    1 +
  2 files changed, 3 insertions(+), 1 deletions(-)
meta/recipes-connectivity/connman/connman.inc +0 -0
index d9d663c..bfe6620 100644
meta/recipes-connectivity/connman/connman.inc LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ · line 20
Quoted 4 lines
meta/recipes-connectivity/connman/connman.inc +0 -0
@@ -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

Quoted 22 lines

meta/recipes-connectivity/connman/connman.inc PACKAGES =+ "${PN}-tools ${PN}-tests" · line 94
Quoted 7 lines
meta/recipes-connectivity/connman/connman.inc +1 -1
  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!
Quoted 10 lines
meta/recipes-connectivity/connman/connman.inc +0 -0
  FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
meta/recipes-connectivity/connman/connman_0.79.bb +1 -0
index 0c3a6fe..f87c4dd 100644
@@ -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"

Saul Wold

Applied

2012-04-06 03:24 UTC #5 lore raw

In reply to Lianhao Lu

Quoted 21 lines · 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(-)

Quoted 5 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

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

Sau!