connman: improve packaging

The scripts being included on connman-scripts was the test utility and
thus we are moving them with the rest of test utilities in
'connman-tests'. A runtime dependency on python-dbus were missing as
well as those scripts uses it.

As no dhclient, resolvconf and udhcpc plugins are being generated the
respective dependency map entries were also removed.

(From OE-Core rev: 6f9594cddefe74ce7381e4fa2a68cb8a542d6d2e)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 7 insertions, 9 deletions

diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 503bf1cffa..bb1b27990c 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -68,16 +68,16 @@ do_install_append() {
         install -d ${D}${bindir}
         install -m 0755 ${S}/tools/*-test ${D}${bindir}
         install -m 0755 ${S}/tools/wispr ${D}${bindir}
+
+        # We don't need to package an empty directory
+        rmdir ${D}${libdir}/connman/scripts
 }
 
 PACKAGES_DYNAMIC = "${PN}-plugin-*"
 
 python populate_packages_prepend() {
         depmap = dict( pppd="ppp",
-                       udhcp="busybox connman-scripts",
-                       dhclient="dhcp-client",
                        wifi="wpa-supplicant",
-                       resolvconf="resolvconf",
                        bluetooth="bluez4",
                        ofono="ofono" )
         packages = []
@@ -94,14 +94,12 @@ python populate_packages_prepend() {
                         d.setVar("RDEPENDS_%s" % package, " ".join(rdepends))
 }
 
-PACKAGES =+ "${PN}-scripts ${PN}-tools ${PN}-tests"
+PACKAGES =+ "${PN}-tools ${PN}-tests"
 
 FILES_${PN}-tools = "${bindir}/wispr"
 
-FILES_${PN}-tests = "${bindir}/*-test"
-
-FILES_${PN}-scripts += "${libdir}/${PN}/test/* ${libdir}/connman/scripts"
-RDEPENDS_${PN}-scripts = "python"
+FILES_${PN}-tests = "${bindir}/*-test ${libdir}/${PN}/test/*"
+RDEPENDS_${PN}-tests = "python-dbus"
 
 FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
             ${sysconfdir} ${sharedstatedir} ${localstatedir} \
diff --git a/meta/recipes-connectivity/connman/connman_0.78.bb b/meta/recipes-connectivity/connman/connman_0.78.bb
index f36f6707c7..74c102b852 100644
--- a/meta/recipes-connectivity/connman/connman_0.78.bb
+++ b/meta/recipes-connectivity/connman/connman_0.78.bb
@@ -1,6 +1,6 @@
 require connman.inc
 
-PR = "r4"
+PR = "r5"
 
 # 0.78 tag
 SRCREV = "02f5d5fe2d7c71514a6387ba2b772b42d8e8d297"