summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/connman
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2011-12-13 10:41:14 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-13 12:28:11 (GMT)
commit406593fdf179b0361ddbfb04da3144dbec8296e0 (patch)
treeccfd52766040eaa78cf2811fd65d8c7ebce4e3bb /meta/recipes-connectivity/connman
parentd6860b2127f692b6e368c81db988fc153cb5291d (diff)
downloadpoky-406593fdf179b0361ddbfb04da3144dbec8296e0.tar.gz
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>
Diffstat (limited to 'meta/recipes-connectivity/connman')
-rw-r--r--meta/recipes-connectivity/connman/connman.inc14
-rw-r--r--meta/recipes-connectivity/connman/connman_0.78.bb2
2 files changed, 7 insertions, 9 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 503bf1c..bb1b279 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -68,16 +68,16 @@ do_install_append() {
68 install -d ${D}${bindir} 68 install -d ${D}${bindir}
69 install -m 0755 ${S}/tools/*-test ${D}${bindir} 69 install -m 0755 ${S}/tools/*-test ${D}${bindir}
70 install -m 0755 ${S}/tools/wispr ${D}${bindir} 70 install -m 0755 ${S}/tools/wispr ${D}${bindir}
71
72 # We don't need to package an empty directory
73 rmdir ${D}${libdir}/connman/scripts
71} 74}
72 75
73PACKAGES_DYNAMIC = "${PN}-plugin-*" 76PACKAGES_DYNAMIC = "${PN}-plugin-*"
74 77
75python populate_packages_prepend() { 78python populate_packages_prepend() {
76 depmap = dict( pppd="ppp", 79 depmap = dict( pppd="ppp",
77 udhcp="busybox connman-scripts",
78 dhclient="dhcp-client",
79 wifi="wpa-supplicant", 80 wifi="wpa-supplicant",
80 resolvconf="resolvconf",
81 bluetooth="bluez4", 81 bluetooth="bluez4",
82 ofono="ofono" ) 82 ofono="ofono" )
83 packages = [] 83 packages = []
@@ -94,14 +94,12 @@ python populate_packages_prepend() {
94 d.setVar("RDEPENDS_%s" % package, " ".join(rdepends)) 94 d.setVar("RDEPENDS_%s" % package, " ".join(rdepends))
95} 95}
96 96
97PACKAGES =+ "${PN}-scripts ${PN}-tools ${PN}-tests" 97PACKAGES =+ "${PN}-tools ${PN}-tests"
98 98
99FILES_${PN}-tools = "${bindir}/wispr" 99FILES_${PN}-tools = "${bindir}/wispr"
100 100
101FILES_${PN}-tests = "${bindir}/*-test" 101FILES_${PN}-tests = "${bindir}/*-test ${libdir}/${PN}/test/*"
102 102RDEPENDS_${PN}-tests = "python-dbus"
103FILES_${PN}-scripts += "${libdir}/${PN}/test/* ${libdir}/connman/scripts"
104RDEPENDS_${PN}-scripts = "python"
105 103
106FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ 104FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
107 ${sysconfdir} ${sharedstatedir} ${localstatedir} \ 105 ${sysconfdir} ${sharedstatedir} ${localstatedir} \
diff --git a/meta/recipes-connectivity/connman/connman_0.78.bb b/meta/recipes-connectivity/connman/connman_0.78.bb
index f36f670..74c102b 100644
--- a/meta/recipes-connectivity/connman/connman_0.78.bb
+++ b/meta/recipes-connectivity/connman/connman_0.78.bb
@@ -1,6 +1,6 @@
1require connman.inc 1require connman.inc
2 2
3PR = "r4" 3PR = "r5"
4 4
5# 0.78 tag 5# 0.78 tag
6SRCREV = "02f5d5fe2d7c71514a6387ba2b772b42d8e8d297" 6SRCREV = "02f5d5fe2d7c71514a6387ba2b772b42d8e8d297"