connman: Fixed multilib support.

1. Corrected the package content of connman-test.

This is part of the bug fixing [YOCTO #2216].

(From OE-Core rev: 4df39d673156cc63b94531515d8f92ca4d0da77f)

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>

Removed ofono addtion - sgw

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 2 insertions, 1 deletions

diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index d9d663c3b8..1a6dd1b7ee 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -90,7 +90,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 0c3a6fe08d..f87c4dd3a0 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"