From 406593fdf179b0361ddbfb04da3144dbec8296e0 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 13 Dec 2011 10:41:14 +0000 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-connectivity/connman/connman.inc | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'meta/recipes-connectivity/connman/connman.inc') 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} \ -- cgit v1.2.3-54-g00ecf