summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/connman
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-06-28 07:58:40 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-29 13:46:54 (GMT)
commit53de954ae433326d09f4cdcfd63d8241ba935980 (patch)
tree5a88e777bca060c1d7292bcf63859cb309a41ea5 /meta/recipes-connectivity/connman
parent6873c1adea0dee712e2636da9e90bc755a6b4097 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-connectivity/connman/connman-0.65/fix-shutdown-ap-disconnect.patch42
-rw-r--r--meta/recipes-connectivity/connman/connman-0.75/add_xuser_dbus_permission.patch (renamed from meta/recipes-connectivity/connman/connman-0.65/add_xuser_dbus_permission.patch)2
-rw-r--r--meta/recipes-connectivity/connman/connman-0.75/connman (renamed from meta/recipes-connectivity/connman/connman-0.65/connman)0
-rw-r--r--meta/recipes-connectivity/connman/connman-0.75/dbusperms.patch (renamed from meta/recipes-connectivity/connman/connman-0.65/dbusperms.patch)2
-rw-r--r--meta/recipes-connectivity/connman/connman.inc14
-rw-r--r--meta/recipes-connectivity/connman/connman_0.75.bb (renamed from meta/recipes-connectivity/connman/connman_0.65.bb)8
6 files changed, 20 insertions, 48 deletions
diff --git a/meta/recipes-connectivity/connman/connman-0.65/fix-shutdown-ap-disconnect.patch b/meta/recipes-connectivity/connman/connman-0.65/fix-shutdown-ap-disconnect.patch
deleted file mode 100644
index a0ad099..0000000
--- a/meta/recipes-connectivity/connman/connman-0.65/fix-shutdown-ap-disconnect.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1Schedule delayed scan when being disconnected from an AP
2
3When being disconnected from an AP, a delayed scan is scheduled to make
4sure the AP is still there. wpa_supplicant removes a BSS from its bss list
5when it disappears from the scan results twice in a row.
6
7Author: Samuel Ortiz <sameo@linux.intel.com>
8Ported by Dongxiao Xu <dongxiao.xu@intel.com>
9
10diff -ruN connman-0.56-orig/plugins/supplicant.c connman-0.56/plugins/supplicant.c
11--- connman-0.56-orig/plugins/supplicant.c 2010-09-25 15:08:21.242927383 +0800
12+++ connman-0.56/plugins/supplicant.c 2010-09-25 15:12:46.346136858 +0800
13@@ -2184,6 +2184,15 @@
14 scanning == TRUE ? "started" : "finished");
15 }
16
17+static gboolean delayed_scan(gpointer user_data)
18+{
19+ struct supplicant_task *task = user_data;
20+
21+ supplicant_scan(task->device);
22+
23+ return FALSE;
24+}
25+
26 static void state_change(struct supplicant_task *task, DBusMessage *msg)
27 {
28 DBusError error;
29@@ -2277,7 +2286,13 @@
30 task_connect(task);
31 } else
32 task->network = NULL;
33+ } else {
34+ if (task->state == WPA_DISCONNECTED)
35+ g_timeout_add_seconds(10, delayed_scan, task);
36+
37+ remove_network(task);
38 }
39+
40 break;
41
42 default:
diff --git a/meta/recipes-connectivity/connman/connman-0.65/add_xuser_dbus_permission.patch b/meta/recipes-connectivity/connman/connman-0.75/add_xuser_dbus_permission.patch
index 787d49b..764c689 100644
--- a/meta/recipes-connectivity/connman/connman-0.65/add_xuser_dbus_permission.patch
+++ b/meta/recipes-connectivity/connman/connman-0.75/add_xuser_dbus_permission.patch
@@ -1,6 +1,8 @@
1Some platform (like atom-pc) enables rootless X, 1Some platform (like atom-pc) enables rootless X,
2thus we need to add the xuser in the list. 2thus we need to add the xuser in the list.
3 3
4Upstream-Status: Inappropriate [configuration]
5
4Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> 6Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
5 7
6diff -ruN connman-0.65-orig/src/connman-dbus.conf connman-0.65/src/connman-dbus.conf 8diff -ruN connman-0.65-orig/src/connman-dbus.conf connman-0.65/src/connman-dbus.conf
diff --git a/meta/recipes-connectivity/connman/connman-0.65/connman b/meta/recipes-connectivity/connman/connman-0.75/connman
index f01bf37..f01bf37 100644
--- a/meta/recipes-connectivity/connman/connman-0.65/connman
+++ b/meta/recipes-connectivity/connman/connman-0.75/connman
diff --git a/meta/recipes-connectivity/connman/connman-0.65/dbusperms.patch b/meta/recipes-connectivity/connman/connman-0.75/dbusperms.patch
index 100af03..c331654 100644
--- a/meta/recipes-connectivity/connman/connman-0.65/dbusperms.patch
+++ b/meta/recipes-connectivity/connman/connman-0.75/dbusperms.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [configuration]
2
1Index: git/src/connman-dbus.conf 3Index: git/src/connman-dbus.conf
2=================================================================== 4===================================================================
3--- git.orig/src/connman-dbus.conf 2009-05-26 00:34:35.000000000 +0100 5--- git.orig/src/connman-dbus.conf 2009-05-26 00:34:35.000000000 +0100
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index fb970ed..ccff573 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
16DEPENDS = "libgdbus dbus glib-2.0 hal iptables" 16DEPENDS = "libgdbus dbus glib-2.0 hal iptables"
17RDEPENDS_${PN} = "wpa-supplicant resolvconf"
18 17
19INITSCRIPT_NAME = "connman" 18INITSCRIPT_NAME = "connman"
20INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ." 19INITSCRIPT_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
42python populate_packages_prepend() { 41python 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}
diff --git a/meta/recipes-connectivity/connman/connman_0.65.bb b/meta/recipes-connectivity/connman/connman_0.75.bb
index 852f8dc..75ef5b5 100644
--- a/meta/recipes-connectivity/connman/connman_0.65.bb
+++ b/meta/recipes-connectivity/connman/connman_0.75.bb
@@ -1,5 +1,5 @@
1require connman.inc 1require connman.inc
2PR = "r1" 2PR = "r0"
3 3
4EXTRA_OECONF += "\ 4EXTRA_OECONF += "\
5 ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \ 5 ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \
@@ -16,14 +16,14 @@ EXTRA_OECONF += "\
16 --disable-udev \ 16 --disable-udev \
17 --disable-polkit \ 17 --disable-polkit \
18 --enable-client \ 18 --enable-client \
19 --enable-ofono \
19 --prefix=/usr --sysconfdir=/etc --localstatedir=/var" 20 --prefix=/usr --sysconfdir=/etc --localstatedir=/var"
20 21
21SRC_URI = "\ 22SRC_URI = "\
22 ${KERNELORG_MIRROR}/linux/network/connman/connman-${PV}.tar.gz \ 23 ${KERNELORG_MIRROR}/linux/network/connman/connman-${PV}.tar.gz \
23 file://fix-shutdown-ap-disconnect.patch \
24 file://add_xuser_dbus_permission.patch \ 24 file://add_xuser_dbus_permission.patch \
25 file://connman \ 25 file://connman \
26" 26"
27 27
28SRC_URI[md5sum] = "bd714da295ed2d2d91a49539f4c4fa3a" 28SRC_URI[md5sum] = "9973cb89a11fff6b51fc85b51c13b711"
29SRC_URI[sha256sum] = "a1c1d93da6bb4c2d8ae53293b06f237e02f5e796d2bba73ec639a466d05259c3" 29SRC_URI[sha256sum] = "b15361237f7ec8092fb0e55d4585550ab35491485edaf10ddd032d6e36299db7"