From 53de954ae433326d09f4cdcfd63d8241ba935980 Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Tue, 28 Jun 2011 15:58:40 +0800 Subject: 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 Signed-off-by: Richard Purdie --- .../connman-0.65/add_xuser_dbus_permission.patch | 21 -------- .../connman/connman-0.65/connman | 62 ---------------------- .../connman/connman-0.65/dbusperms.patch | 12 ----- .../connman-0.65/fix-shutdown-ap-disconnect.patch | 42 --------------- .../connman-0.75/add_xuser_dbus_permission.patch | 23 ++++++++ .../connman/connman-0.75/connman | 62 ++++++++++++++++++++++ .../connman/connman-0.75/dbusperms.patch | 14 +++++ meta/recipes-connectivity/connman/connman.inc | 14 ++++- meta/recipes-connectivity/connman/connman_0.65.bb | 29 ---------- meta/recipes-connectivity/connman/connman_0.75.bb | 29 ++++++++++ 10 files changed, 140 insertions(+), 168 deletions(-) delete mode 100644 meta/recipes-connectivity/connman/connman-0.65/add_xuser_dbus_permission.patch delete mode 100644 meta/recipes-connectivity/connman/connman-0.65/connman delete mode 100644 meta/recipes-connectivity/connman/connman-0.65/dbusperms.patch delete mode 100644 meta/recipes-connectivity/connman/connman-0.65/fix-shutdown-ap-disconnect.patch create mode 100644 meta/recipes-connectivity/connman/connman-0.75/add_xuser_dbus_permission.patch create mode 100644 meta/recipes-connectivity/connman/connman-0.75/connman create mode 100644 meta/recipes-connectivity/connman/connman-0.75/dbusperms.patch delete mode 100644 meta/recipes-connectivity/connman/connman_0.65.bb create mode 100644 meta/recipes-connectivity/connman/connman_0.75.bb (limited to 'meta/recipes-connectivity') 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 787d49ba8d..0000000000 --- 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 - -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 @@ - - - -+ -+ -+ -+ -+ -+ - - - 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 f01bf371c2..0000000000 --- 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 100af0367b..0000000000 --- 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 @@ - - - -- -+ - - 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 a0ad0991df..0000000000 --- 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 -Ported by Dongxiao Xu - -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: diff --git a/meta/recipes-connectivity/connman/connman-0.75/add_xuser_dbus_permission.patch b/meta/recipes-connectivity/connman/connman-0.75/add_xuser_dbus_permission.patch new file mode 100644 index 0000000000..764c689fcc --- /dev/null +++ b/meta/recipes-connectivity/connman/connman-0.75/add_xuser_dbus_permission.patch @@ -0,0 +1,23 @@ +Some platform (like atom-pc) enables rootless X, +thus we need to add the xuser in the list. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Dongxiao Xu + +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 @@ + + + ++ ++ ++ ++ ++ ++ + + + diff --git a/meta/recipes-connectivity/connman/connman-0.75/connman b/meta/recipes-connectivity/connman/connman-0.75/connman new file mode 100644 index 0000000000..f01bf371c2 --- /dev/null +++ b/meta/recipes-connectivity/connman/connman-0.75/connman @@ -0,0 +1,62 @@ +#!/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.75/dbusperms.patch b/meta/recipes-connectivity/connman/connman-0.75/dbusperms.patch new file mode 100644 index 0000000000..c331654de8 --- /dev/null +++ b/meta/recipes-connectivity/connman/connman-0.75/dbusperms.patch @@ -0,0 +1,14 @@ +Upstream-Status: Inappropriate [configuration] + +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 @@ + + + +- ++ + + 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 \ file://src/main.c;beginline=1;endline=20;md5=4b55b550fa6b33cc2055ef30dd262b3e" DEPENDS = "libgdbus dbus glib-2.0 hal iptables" -RDEPENDS_${PN} = "wpa-supplicant resolvconf" INITSCRIPT_NAME = "connman" INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ." @@ -40,7 +39,18 @@ FILES_${PN}-dbg += "${libdir}/connman/plugins/.debug \ ${libdir}/connman/scripts/.debug" python populate_packages_prepend() { + depmap = dict( wifi="wpa-supplicant", bluetooth="bluez4", ofono="ofono" ) + packages = [] + hook = lambda file,pkg,b,c,d:packages.append((file,pkg)) + plugin_dir = bb.data.expand('${libdir}/connman/plugins/', d) plugin_name = bb.data.expand('${PN}-plugin-%s', d) - do_split_packages(d, plugin_dir, '^(.*).so$', plugin_name, '${PN} plugin for %s', extra_depends='' ) + + do_split_packages(d, plugin_dir, '^(.*).so$', plugin_name, '${PN} plugin for %s', extra_depends='', hook=hook ) + + for (file, package) in packages: + plugintype = package.split( '-' )[-1] + if plugintype in depmap: + bb.note( "Adding rdependency on %s to package %s" % ( depmap[plugintype], package ) ) + bb.data.setVar("RDEPENDS_%s" % package, depmap[plugintype], d) } diff --git a/meta/recipes-connectivity/connman/connman_0.65.bb b/meta/recipes-connectivity/connman/connman_0.65.bb deleted file mode 100644 index 852f8dc873..0000000000 --- a/meta/recipes-connectivity/connman/connman_0.65.bb +++ /dev/null @@ -1,29 +0,0 @@ -require connman.inc -PR = "r1" - -EXTRA_OECONF += "\ - ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \ - --disable-gtk-doc \ - --enable-debug \ - --enable-threads \ - --enable-loopback \ - --enable-ethernet \ - --enable-wifi \ - --enable-bluetooth \ - --enable-dnsproxy \ - --disable-dhclient \ - --enable-test \ - --disable-udev \ - --disable-polkit \ - --enable-client \ - --prefix=/usr --sysconfdir=/etc --localstatedir=/var" - -SRC_URI = "\ - ${KERNELORG_MIRROR}/linux/network/connman/connman-${PV}.tar.gz \ - file://fix-shutdown-ap-disconnect.patch \ - file://add_xuser_dbus_permission.patch \ - file://connman \ -" - -SRC_URI[md5sum] = "bd714da295ed2d2d91a49539f4c4fa3a" -SRC_URI[sha256sum] = "a1c1d93da6bb4c2d8ae53293b06f237e02f5e796d2bba73ec639a466d05259c3" diff --git a/meta/recipes-connectivity/connman/connman_0.75.bb b/meta/recipes-connectivity/connman/connman_0.75.bb new file mode 100644 index 0000000000..75ef5b54b6 --- /dev/null +++ b/meta/recipes-connectivity/connman/connman_0.75.bb @@ -0,0 +1,29 @@ +require connman.inc +PR = "r0" + +EXTRA_OECONF += "\ + ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \ + --disable-gtk-doc \ + --enable-debug \ + --enable-threads \ + --enable-loopback \ + --enable-ethernet \ + --enable-wifi \ + --enable-bluetooth \ + --enable-dnsproxy \ + --disable-dhclient \ + --enable-test \ + --disable-udev \ + --disable-polkit \ + --enable-client \ + --enable-ofono \ + --prefix=/usr --sysconfdir=/etc --localstatedir=/var" + +SRC_URI = "\ + ${KERNELORG_MIRROR}/linux/network/connman/connman-${PV}.tar.gz \ + file://add_xuser_dbus_permission.patch \ + file://connman \ +" + +SRC_URI[md5sum] = "9973cb89a11fff6b51fc85b51c13b711" +SRC_URI[sha256sum] = "b15361237f7ec8092fb0e55d4585550ab35491485edaf10ddd032d6e36299db7" -- cgit v1.2.3-54-g00ecf