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:44:26 +0100 |
commit | 7d24ef3454d2bcdf175c17206c8016bafe5e9372 (patch) | |
tree | de0e349e603b229da57aa60700730262a93e2392 /meta/recipes-connectivity/connman/connman-0.65 | |
parent | 8c29862d932176a94686372414d2e05f3a6728d3 (diff) | |
download | openembedded-core-7d24ef3454d2bcdf175c17206c8016bafe5e9372.tar.gz openembedded-core-7d24ef3454d2bcdf175c17206c8016bafe5e9372.tar.bz2 openembedded-core-7d24ef3454d2bcdf175c17206c8016bafe5e9372.tar.xz openembedded-core-7d24ef3454d2bcdf175c17206c8016bafe5e9372.zip |
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.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Diffstat (limited to 'meta/recipes-connectivity/connman/connman-0.65')
4 files changed, 0 insertions, 137 deletions
diff --git a/meta/recipes-connectivity/connman/connman-0.65/add_xuser_dbus_permission.patch b/meta/recipes-connectivity/connman/connman-0.65/add_xuser_dbus_permission.patch deleted file mode 100644 index 787d49ba8..000000000 --- a/meta/recipes-connectivity/connman/connman-0.65/add_xuser_dbus_permission.patch +++ /dev/null @@ -1,21 +0,0 @@ -Some platform (like atom-pc) enables rootless X, -thus we need to add the xuser in the list. - -Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> - -diff -ruN connman-0.65-orig/src/connman-dbus.conf connman-0.65/src/connman-dbus.conf ---- connman-0.65-orig/src/connman-dbus.conf 2011-03-04 09:34:49.000000000 +0800 -+++ connman-0.65/src/connman-dbus.conf 2011-03-04 09:35:21.000000000 +0800 -@@ -7,6 +7,12 @@ - <allow send_interface="net.connman.Agent"/> - <allow send_interface="net.connman.Counter"/> - </policy> -+ <policy user="xuser"> -+ <allow own="net.connman"/> -+ <allow send_destination="net.connman"/> -+ <allow send_interface="net.connman.Agent"/> -+ <allow send_interface="net.connman.Counter"/> -+ </policy> - <policy at_console="true"> - <allow send_destination="net.connman"/> - </policy> diff --git a/meta/recipes-connectivity/connman/connman-0.65/connman b/meta/recipes-connectivity/connman/connman-0.65/connman deleted file mode 100644 index f01bf371c..000000000 --- a/meta/recipes-connectivity/connman/connman-0.65/connman +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh - -DAEMON=/usr/sbin/connmand -PIDFILE=/var/run/connmand.pid -DESC="Connection Manager" - -if [ -f /etc/default/connman ] ; then - . /etc/default/connman -fi - -set -e - -nfsroot=0 - -exec 9<&0 < /proc/mounts -while read dev mtpt fstype rest; do - if test $mtpt = "/" ; then - case $fstype in - nfs | nfs4) - nfsroot=1 - break - ;; - *) - ;; - esac - fi -done - -do_start() { - EXTRA_PARAM="" - if test $nfsroot -eq 1 ; then - EXTRA_PARAM="-P ethernet" - fi - $DAEMON $EXTRA_PARAM -} - -do_stop() { - start-stop-daemon --stop --name connmand --quiet -} - -case "$1" in - start) - echo "Starting $DESC" - do_start - ;; - stop) - echo "Stopping $DESC" - do_stop - ;; - restart|force-reload) - echo "Restarting $DESC" - do_stop - sleep 1 - do_start - ;; - *) - echo "Usage: $0 {start|stop|restart|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/meta/recipes-connectivity/connman/connman-0.65/dbusperms.patch b/meta/recipes-connectivity/connman/connman-0.65/dbusperms.patch deleted file mode 100644 index 100af0367..000000000 --- a/meta/recipes-connectivity/connman/connman-0.65/dbusperms.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: git/src/connman-dbus.conf -=================================================================== ---- git.orig/src/connman-dbus.conf 2009-05-26 00:34:35.000000000 +0100 -+++ git/src/connman-dbus.conf 2009-05-26 00:34:48.000000000 +0100 -@@ -10,6 +10,6 @@ - <allow send_destination="org.moblin.connman"/> - </policy> - <policy context="default"> -- <deny send_destination="org.moblin.connman"/> -+ <allow send_destination="org.moblin.connman"/> - </policy> - </busconfig> 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 a0ad0991d..000000000 --- a/meta/recipes-connectivity/connman/connman-0.65/fix-shutdown-ap-disconnect.patch +++ /dev/null @@ -1,42 +0,0 @@ -Schedule delayed scan when being disconnected from an AP - -When being disconnected from an AP, a delayed scan is scheduled to make -sure the AP is still there. wpa_supplicant removes a BSS from its bss list -when it disappears from the scan results twice in a row. - -Author: Samuel Ortiz <sameo@linux.intel.com> -Ported by Dongxiao Xu <dongxiao.xu@intel.com> - -diff -ruN connman-0.56-orig/plugins/supplicant.c connman-0.56/plugins/supplicant.c ---- connman-0.56-orig/plugins/supplicant.c 2010-09-25 15:08:21.242927383 +0800 -+++ connman-0.56/plugins/supplicant.c 2010-09-25 15:12:46.346136858 +0800 -@@ -2184,6 +2184,15 @@ - scanning == TRUE ? "started" : "finished"); - } - -+static gboolean delayed_scan(gpointer user_data) -+{ -+ struct supplicant_task *task = user_data; -+ -+ supplicant_scan(task->device); -+ -+ return FALSE; -+} -+ - static void state_change(struct supplicant_task *task, DBusMessage *msg) - { - DBusError error; -@@ -2277,7 +2286,13 @@ - task_connect(task); - } else - task->network = NULL; -+ } else { -+ if (task->state == WPA_DISCONNECTED) -+ g_timeout_add_seconds(10, delayed_scan, task); -+ -+ remove_network(task); - } -+ - break; - - default: |