summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2011-11-03 18:40:21 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-08 14:32:55 +0000
commita1c15cb36475f2eafe4b8147f5b4ec4fc08ab41b (patch)
tree022a2262bc46aab94d2595c5c7a7be5a137126a2 /meta/recipes-connectivity
parent8b77079321f96b3a7f96b8d0ff74bd90488db7bd (diff)
downloadpoky-a1c15cb36475f2eafe4b8147f5b4ec4fc08ab41b.tar.gz
connman: split scripts into separate package
The connman scripts are useless without a Python interpreter so split them into a separate package and add Python to its RDEPENDS. (From OE-Core rev: 281510acd0ee3221dd804d7d9de567be2be675f4) Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/connman/connman.inc6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 480b59cb5c..e86bd9fa38 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -30,6 +30,9 @@ do_install_append() {
30 install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman 30 install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman
31} 31}
32 32
33PACKAGES += "${PN}-scripts"
34RDEPENDS_${PN}-scripts += "python"
35
33PACKAGES_DYNAMIC = "${PN}-plugin-*" 36PACKAGES_DYNAMIC = "${PN}-plugin-*"
34FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ 37FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
35 ${sysconfdir} ${sharedstatedir} ${localstatedir} \ 38 ${sysconfdir} ${sharedstatedir} ${localstatedir} \
@@ -37,7 +40,6 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
37 ${datadir}/pixmaps ${datadir}/applications \ 40 ${datadir}/pixmaps ${datadir}/applications \
38 ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ 41 ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
39 ${libdir}/bonobo/servers \ 42 ${libdir}/bonobo/servers \
40 ${libdir}/${PN}/test/* \
41 ${datadir}/dbus-1/system-services/* \ 43 ${datadir}/dbus-1/system-services/* \
42 ${libdir}/connman/scripts/dhclient*" 44 ${libdir}/connman/scripts/dhclient*"
43FILES_${PN}-dbg += "${libdir}/connman/plugins/.debug \ 45FILES_${PN}-dbg += "${libdir}/connman/plugins/.debug \
@@ -45,6 +47,8 @@ FILES_${PN}-dbg += "${libdir}/connman/plugins/.debug \
45 47
46FILES_${PN}-dev += "${libdir}/connman/plugins/*.la" 48FILES_${PN}-dev += "${libdir}/connman/plugins/*.la"
47 49
50FILES_${PN}-scripts += "${libdir}/${PN}/test/*"
51
48python populate_packages_prepend() { 52python populate_packages_prepend() {
49 prefix = (d.getVar("MLPREFIX", True) or "") 53 prefix = (d.getVar("MLPREFIX", True) or "")
50 depmap = dict( wifi=prefix+"wpa-supplicant", bluetooth=prefix+"bluez4", ofono=prefix+"ofono" ) 54 depmap = dict( wifi=prefix+"wpa-supplicant", bluetooth=prefix+"bluez4", ofono=prefix+"ofono" )