diff options
author | Dongxiao Xu <dongxiao.xu@intel.com> | 2011-06-28 15:58:40 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-29 14:46:54 +0100 |
commit | 53de954ae433326d09f4cdcfd63d8241ba935980 (patch) | |
tree | 5a88e777bca060c1d7292bcf63859cb309a41ea5 /meta/recipes-connectivity/connman/connman.inc | |
parent | 6873c1adea0dee712e2636da9e90bc755a6b4097 (diff) | |
download | poky-53de954ae433326d09f4cdcfd63d8241ba935980.tar.gz |
connman: Upgrade to version 0.75
Enable ofono plugin.
Adopt some logic in meta-oe on connman plugin runtime dependency.
Remove the fix-shutdown-ap-disconnect.patch since the original logic no longer exists.
Add Upstream-Status information for patches.
(From OE-Core rev: 7d24ef3454d2bcdf175c17206c8016bafe5e9372)
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/connman/connman.inc')
-rw-r--r-- | meta/recipes-connectivity/connman/connman.inc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index fb970ed1eb..ccff573568 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc | |||
@@ -14,7 +14,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ | |||
14 | file://src/main.c;beginline=1;endline=20;md5=4b55b550fa6b33cc2055ef30dd262b3e" | 14 | file://src/main.c;beginline=1;endline=20;md5=4b55b550fa6b33cc2055ef30dd262b3e" |
15 | 15 | ||
16 | DEPENDS = "libgdbus dbus glib-2.0 hal iptables" | 16 | DEPENDS = "libgdbus dbus glib-2.0 hal iptables" |
17 | RDEPENDS_${PN} = "wpa-supplicant resolvconf" | ||
18 | 17 | ||
19 | INITSCRIPT_NAME = "connman" | 18 | INITSCRIPT_NAME = "connman" |
20 | INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ." | 19 | INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ." |
@@ -40,7 +39,18 @@ FILES_${PN}-dbg += "${libdir}/connman/plugins/.debug \ | |||
40 | ${libdir}/connman/scripts/.debug" | 39 | ${libdir}/connman/scripts/.debug" |
41 | 40 | ||
42 | python populate_packages_prepend() { | 41 | python populate_packages_prepend() { |
42 | depmap = dict( wifi="wpa-supplicant", bluetooth="bluez4", ofono="ofono" ) | ||
43 | packages = [] | ||
44 | hook = lambda file,pkg,b,c,d:packages.append((file,pkg)) | ||
45 | |||
43 | plugin_dir = bb.data.expand('${libdir}/connman/plugins/', d) | 46 | plugin_dir = bb.data.expand('${libdir}/connman/plugins/', d) |
44 | plugin_name = bb.data.expand('${PN}-plugin-%s', d) | 47 | plugin_name = bb.data.expand('${PN}-plugin-%s', d) |
45 | do_split_packages(d, plugin_dir, '^(.*).so$', plugin_name, '${PN} plugin for %s', extra_depends='' ) | 48 | |
49 | do_split_packages(d, plugin_dir, '^(.*).so$', plugin_name, '${PN} plugin for %s', extra_depends='', hook=hook ) | ||
50 | |||
51 | for (file, package) in packages: | ||
52 | plugintype = package.split( '-' )[-1] | ||
53 | if plugintype in depmap: | ||
54 | bb.note( "Adding rdependency on %s to package %s" % ( depmap[plugintype], package ) ) | ||
55 | bb.data.setVar("RDEPENDS_%s" % package, depmap[plugintype], d) | ||
46 | } | 56 | } |