3G network support
y
cover 3G network support
From: Dongxiao Xu <[email protected]>
Hi Saul,
The following commits enables 3G feature for Yocto Project. Please help to review and pull.
Some notes:
a) 0001.patch: Automatically load some kernel modules which is used to support usb network.
b) 0002.patch: upgrade connman to 0.73, also add ofono plugin.
c) 0003.patch: Remove 0.6.10 versio of wpa-supplicant. (This commit is not related with 3G support).
d) 0004.patch: Add 0.42 version of ofono. Because ofonod after 0.42 would crash on Ericsson 3G module.
e) 0005.patch: Add 3G config UI in connman-gnome. Also upgrade it to latest git head.
The following changes since commit 7f34cd1eb2a459709006ae985a14decd4d2152e6:
tzcode: Update to 2011g (2011-06-06 15:58:42 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib dxu4/upgrade
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/upgrade
Dongxiao Xu (5):
kernel.bbclass: Auto load cdc-acm and cdc-wdm
connman: Upgrade to version 0.73
wpa-supplicant: remove the 0.6.10 version.
ofono: add 0.42 version which works OK for Ericsson 3G module.
connman-gnome: Add 3G configuration support
meta/classes/kernel.bbclass | 2 +
meta/conf/distro/include/default-versions.inc | 1 +
.../connman-0.65/fix-shutdown-ap-disconnect.patch | 42 -
.../add_xuser_dbus_permission.patch | 2 +
.../connman/{connman-0.65 => connman-0.73}/connman | 0
.../{connman-0.65 => connman-0.73}/dbusperms.patch | 2 +
.../connman/connman-gnome/3g.patch | 505 +++
.../connman-gnome/applet_menu_popup_fix.patch | 19 -
.../connman/connman-gnome/connman-gnome.patch | 4162 --------------------
.../remove-connman-property-desktop-file.patch | 42 -
.../connman-gnome/service_name_update.patch | 36 -
.../{connman-gnome_0.5.bb => connman-gnome_git.bb} | 17 +-
meta/recipes-connectivity/connman/connman.inc | 2 +-
.../connman/{connman_0.65.bb => connman_0.73.bb} | 8 +-
meta/recipes-connectivity/ofono/ofono.inc | 2 +
meta/recipes-connectivity/ofono/ofono_0.42.bb | 13 +
.../wpa-supplicant-0.6.10/99_wpa_supplicant | 1 -
.../wpa-supplicant-0.6.10/defaults-sane | 8 -
.../wpa-supplicant-0.6.10/defconfig-0.6.0-gnutls | 180 -
.../wpa-supplicant-0.6.10/wpa-supplicant.sh | 85 -
.../wpa-supplicant-0.6.10/wpa_supplicant.conf | 690 ----
.../wpa-supplicant-0.6.10/wpa_supplicant.conf-sane | 7 -
.../wpa-supplicant/wpa-supplicant-0.6.inc | 83 -
.../wpa-supplicant/wpa-supplicant_0.6.10.bb | 4 -
24 files changed, 542 insertions(+), 5371 deletions(-)
delete mode 100644 meta/recipes-connectivity/connman/connman-0.65/fix-shutdown-ap-disconnect.patch
rename meta/recipes-connectivity/connman/{connman-0.65 => connman-0.73}/add_xuser_dbus_permission.patch (94%)
rename meta/recipes-connectivity/connman/{connman-0.65 => connman-0.73}/connman (100%)
rename meta/recipes-connectivity/connman/{connman-0.65 => connman-0.73}/dbusperms.patch (91%)
create mode 100644 meta/recipes-connectivity/connman/connman-gnome/3g.patch
delete mode 100644 meta/recipes-connectivity/connman/connman-gnome/applet_menu_popup_fix.patch
delete mode 100644 meta/recipes-connectivity/connman/connman-gnome/connman-gnome.patch
delete mode 100644 meta/recipes-connectivity/connman/connman-gnome/remove-connman-property-desktop-file.patch
delete mode 100644 meta/recipes-connectivity/connman/connman-gnome/service_name_update.patch
rename meta/recipes-connectivity/connman/{connman-gnome_0.5.bb => connman-gnome_git.bb} (72%)
rename meta/recipes-connectivity/connman/{connman_0.65.bb => connman_0.73.bb} (74%)
create mode 100644 meta/recipes-connectivity/ofono/ofono_0.42.bb
delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/99_wpa_supplicant
delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/defaults-sane
delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/defconfig-0.6.0-gnutls
delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/wpa-supplicant.sh
delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/wpa_supplicant.conf
delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/wpa_supplicant.conf-sane
delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.inc
delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.6.10.bby
PATCH 1/5 kernel.bbclass: Auto load cdc-acm and cdc-wdm
From: Dongxiao Xu <[email protected]>
Automatically load cdc-acm.ko and cdc-wdm.ko to support 3G module.
--- meta/classes/kernel.bbclass | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
meta/classes/kernel.bbclass +2 -0
@@ -264,6 +264,8 @@ module_autoload_rfcomm = "rfcomm" module_autoload_sa1100-rtc = "sa1100-rtc" # sa1100-rtc was renamed in 2.6.23 onwards module_autoload_rtc-sa1100 = "rtc-sa1100" +module_autoload_cdc-acm = "cdc-acm" +module_autoload_cdc-wdm = "cdc-wdm" # alias defaults (alphabetically sorted) module_conf_af_packet = "alias net-pf-17 af_packet"
Signature · 1 line
1.7.1
y
PATCH 2/5 connman: Upgrade to version 0.73
In reply to yFrom: Dongxiao Xu <[email protected]>
Enable ofono plugin into sato image.
Remove the fix-shutdown-ap-disconnect.patch since the original logic no longer exists. Add Upstream-Status information for patches.
---
.../connman-0.65/fix-shutdown-ap-disconnect.patch | 42 --------------------
.../add_xuser_dbus_permission.patch | 2 +
.../connman/{connman-0.65 => connman-0.73}/connman | 0
.../{connman-0.65 => connman-0.73}/dbusperms.patch | 2 +
meta/recipes-connectivity/connman/connman.inc | 2 +-
.../connman/{connman_0.65.bb => connman_0.73.bb} | 8 ++--
6 files changed, 9 insertions(+), 47 deletions(-)
delete mode 100644 meta/recipes-connectivity/connman/connman-0.65/fix-shutdown-ap-disconnect.patch
rename meta/recipes-connectivity/connman/{connman-0.65 => connman-0.73}/add_xuser_dbus_permission.patch (94%)
rename meta/recipes-connectivity/connman/{connman-0.65 => connman-0.73}/connman (100%)
rename meta/recipes-connectivity/connman/{connman-0.65 => connman-0.73}/dbusperms.patch (91%)
rename meta/recipes-connectivity/connman/{connman_0.65.bb => connman_0.73.bb} (74%)meta/recipes-connectivity/connman/connman-0.65/fix-shutdown-ap-disconnect.patch deleted +0 -42
@@ -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 <[email protected]> -Ported by Dongxiao Xu <[email protected]> - -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:
meta/recipes-connectivity/connman/connman-0.73/add_xuser_dbus_permission.patch renamed from meta/recipes-connectivity/connman/connman-0.65/add_xuser_dbus_permission.patch +2 -0
@@ -1,6 +1,8 @@ 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 <[email protected]> diff -ruN connman-0.65-orig/src/connman-dbus.conf connman-0.65/src/connman-dbus.conf
meta/recipes-connectivity/connman/connman-0.73/connman renamed from meta/recipes-connectivity/connman/connman-0.65/connman +0 -0
meta/recipes-connectivity/connman/connman-0.73/dbusperms.patch renamed from meta/recipes-connectivity/connman/connman-0.65/dbusperms.patch +2 -0
@@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + Index: git/src/connman-dbus.conf =================================================================== --- git.orig/src/connman-dbus.conf 2009-05-26 00:34:35.000000000 +0100
meta/recipes-connectivity/connman/connman.inc +1 -1
@@ -14,7 +14,7 @@ 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" +RDEPENDS_${PN} = "wpa-supplicant resolvconf ofono" INITSCRIPT_NAME = "connman" INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ."
meta/recipes-connectivity/connman/connman_0.73.bb renamed from meta/recipes-connectivity/connman/connman_0.65.bb +4 -4
@@ -1,5 +1,5 @@ require connman.inc -PR = "r1" +PR = "r0" EXTRA_OECONF += "\ ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \
@@ -16,14 +16,14 @@ EXTRA_OECONF += "\ --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://fix-shutdown-ap-disconnect.patch \ file://add_xuser_dbus_permission.patch \ file://connman \ " -SRC_URI[md5sum] = "bd714da295ed2d2d91a49539f4c4fa3a" -SRC_URI[sha256sum] = "a1c1d93da6bb4c2d8ae53293b06f237e02f5e796d2bba73ec639a466d05259c3" +SRC_URI[md5sum] = "01085b2ed8f7b11a41724f1528720cc7" +SRC_URI[sha256sum] = "b71ff2c3925ea82a7ebf818685f809e595d5c47d767005dfb149c6264b098417"
Signature · 1 line
1.7.1
y
PATCH 3/5 wpa-supplicant: remove the 0.6.10 version.
In reply to yFrom: Dongxiao Xu <[email protected]>
Remove the 0.6.10 version since now 0.7.3 is the latest stable version.
--- .../wpa-supplicant-0.6.10/99_wpa_supplicant | 1 - .../wpa-supplicant-0.6.10/defaults-sane | 8 - .../wpa-supplicant-0.6.10/defconfig-0.6.0-gnutls | 180 ----- .../wpa-supplicant-0.6.10/wpa-supplicant.sh | 85 --- .../wpa-supplicant-0.6.10/wpa_supplicant.conf | 690 -------------------- .../wpa-supplicant-0.6.10/wpa_supplicant.conf-sane | 7 - .../wpa-supplicant/wpa-supplicant-0.6.inc | 83 --- .../wpa-supplicant/wpa-supplicant_0.6.10.bb | 4 - 8 files changed, 0 insertions(+), 1058 deletions(-) delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/99_wpa_supplicant delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/defaults-sane delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/defconfig-0.6.0-gnutls delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/wpa-supplicant.sh delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/wpa_supplicant.conf delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/wpa_supplicant.conf-sane delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.inc delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.6.10.bb
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/99_wpa_supplicant deleted +0 -1
@@ -1 +0,0 @@ -d root root 0700 /var/run/wpa_supplicant none
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/defaults-sane deleted +0 -8
@@ -1,8 +0,0 @@ -# Useful flags: -# -i <ifname> Interface (required, unless specified in config) -# -D <driver> Wireless Driver -# -d Debugging (-dd for more) -# -q Quiet (-qq for more) - -CONFIG="/etc/wpa_supplicant.conf" -OPTIONS="-i eth1 -D wext"
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/defconfig-0.6.0-gnutls deleted +0 -180
180 lines not on this page · raw message
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/wpa-supplicant.sh deleted +0 -85
85 lines not on this page · raw message
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/wpa_supplicant.conf deleted +0 -690
690 lines not on this page · raw message
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/wpa_supplicant.conf-sane deleted +0 -7
@@ -1,7 +0,0 @@ -ctrl_interface=/var/run/wpa_supplicant -ctrl_interface_group=0 -update_config=1 - -network={ - key_mgmt=NONE -}
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.inc deleted +0 -83
83 lines not on this page · raw message
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.6.10.bb deleted +0 -4
@@ -1,4 +0,0 @@ -require wpa-supplicant-0.6.inc - -PE = "1" -PR = "r0"
Signature · 1 line
1.7.1
y
PATCH 4/5 ofono: add 0.42 version which works OK for Ericsson 3G module.
In reply to yFrom: Dongxiao Xu <[email protected]>
We met ofonod crash after ofono-0.43 version. Thus import 0.42 version to enable the 3G feature.
--- meta/conf/distro/include/default-versions.inc | 1 + meta/recipes-connectivity/ofono/ofono.inc | 2 ++ meta/recipes-connectivity/ofono/ofono_0.42.bb | 13 +++++++++++++ 3 files changed, 16 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-connectivity/ofono/ofono_0.42.bb
meta/conf/distro/include/default-versions.inc +1 -0
@@ -13,6 +13,7 @@ PREFERRED_VERSION_python-native ?= "2.6.6" # Force the older version of liberation-fonts until we fix the fontforge issue PREFERRED_VERSION_liberation-fonts ?= "1.04" +PREFERRED_VERSION_ofono ?= "0.42"
meta/recipes-connectivity/ofono/ofono.inc +2 -0
@@ -15,5 +15,7 @@ INITSCRIPT_PARAMS = "defaults 22" do_install_append() { install -d ${D}${sysconfdir}/init.d/ install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono + install -d ${D}${sysconfdir}/udev/rules.d/ + install -m 0644 ${S}/plugins/97-ofono.rules ${D}${sysconfdir}/udev/rules.d/ }
meta/recipes-connectivity/ofono/ofono_0.42.bb new file +13 -0
@@ -0,0 +1,13 @@ +require ofono.inc + +PR = "r0" + +SRC_URI = "${KERNELORG_MIRROR}/linux/network/ofono/${P}.tar.bz2 \ + file://ofono" + +EXTRA_OECONF += "\ + --enable-test \ +" + +SRC_URI[md5sum] = "e3ccf43a287153eed25f8dd75e7c6d18" +SRC_URI[sha256sum] = "5b6f78cbe218fbc5c84401cd9d64b3204529e98822f959a9b2aae34b538076af"
Signature · 1 line
1.7.1
y
PATCH 5/5 connman-gnome: Add 3G configuration support
In reply to yFrom: Dongxiao Xu <[email protected]>
Apply 3g.patch which add cellular config option in connman-gnome. Remove all other patches since they have been accepted in upstream.
---
.../connman/connman-gnome/3g.patch | 505 +++
.../connman-gnome/applet_menu_popup_fix.patch | 19 -
.../connman/connman-gnome/connman-gnome.patch | 4162 --------------------
.../remove-connman-property-desktop-file.patch | 42 -
.../connman-gnome/service_name_update.patch | 36 -
.../{connman-gnome_0.5.bb => connman-gnome_git.bb} | 17 +-
6 files changed, 515 insertions(+), 4266 deletions(-)
create mode 100644 meta/recipes-connectivity/connman/connman-gnome/3g.patch
delete mode 100644 meta/recipes-connectivity/connman/connman-gnome/applet_menu_popup_fix.patch
delete mode 100644 meta/recipes-connectivity/connman/connman-gnome/connman-gnome.patch
delete mode 100644 meta/recipes-connectivity/connman/connman-gnome/remove-connman-property-desktop-file.patch
delete mode 100644 meta/recipes-connectivity/connman/connman-gnome/service_name_update.patch
rename meta/recipes-connectivity/connman/{connman-gnome_0.5.bb => connman-gnome_git.bb} (72%)meta/recipes-connectivity/connman/connman-gnome/3g.patch new file +505 -0
@@ -0,0 +1,505 @@ +commit 15852e826b0b47f577718ada4b68b63515387f4d +Author: dongxiao <dongxiao@dongxiao-osel.(none)> +Date: Wed Jun 1 14:56:16 2011 +0800 + + connman-gnome: Add cellular network config option. + + Add cellular network config option in connman-gnome. + + Signed-off-by: Dongxiao Xu <[email protected]> + +diff --git a/common/connman-client.c b/common/connman-client.c +index e907cc2..d6be363 100644 +--- a/common/connman-client.c ++++ b/common/connman-client.c +@@ -112,9 +112,10 @@ static void connman_client_init(ConnmanClient *client) + G_TYPE_STRING, /* address */ + G_TYPE_STRING, /* netmask */ + G_TYPE_STRING, /* gateway */ +- G_TYPE_BOOLEAN, /* gateway */ +- G_TYPE_BOOLEAN, /* gateway */ +- G_TYPE_BOOLEAN);/* gateway */ ++ G_TYPE_BOOLEAN, /* ethernet enabled */ ++ G_TYPE_BOOLEAN, /* wifi enabled */ ++ G_TYPE_BOOLEAN, /* cellular enabled */ ++ G_TYPE_BOOLEAN);/* offline */ + + g_object_set_data(G_OBJECT(priv->store), + "State", g_strdup("unavailable")); +@@ -218,6 +219,7 @@ static gboolean device_filter(GtkTreeModel *model, + switch (type) { + case CONNMAN_TYPE_LABEL_ETHERNET: + case CONNMAN_TYPE_LABEL_WIFI: ++ case CONNMAN_TYPE_LABEL_CELLULAR: + case CONNMAN_TYPE_SYSCONFIG: + return TRUE; + } +diff --git a/common/connman-client.h b/common/connman-client.h +index 37e86d0..15fa098 100644 +--- a/common/connman-client.h ++++ b/common/connman-client.h +@@ -117,6 +117,7 @@ enum { + + CONNMAN_COLUMN_ETHERNET_ENABLED,/* G_TYPE_STRING */ + CONNMAN_COLUMN_WIFI_ENABLED, /* G_TYPE_STRING */ ++ CONNMAN_COLUMN_CELLULAR_ENABLED,/* G_TYPE_STRING */ + CONNMAN_COLUMN_OFFLINEMODE, /* G_TYPE_STRING */ + + _CONNMAN_NUM_COLUMNS +@@ -132,6 +133,7 @@ enum { + + CONNMAN_TYPE_LABEL_ETHERNET, + CONNMAN_TYPE_LABEL_WIFI, ++ CONNMAN_TYPE_LABEL_CELLULAR, + CONNMAN_TYPE_SYSCONFIG, + + _CONNMAN_NUM_TYPE, +diff --git a/common/connman-dbus.c b/common/connman-dbus.c +index b5a635c..0f4e1db 100644 +--- a/common/connman-dbus.c ++++ b/common/connman-dbus.c +@@ -208,6 +208,8 @@ static const gchar *type2icon(guint type) + case CONNMAN_TYPE_WIFI: + case CONNMAN_TYPE_WIMAX: + return "network-wireless"; ++ case CONNMAN_TYPE_CELLULAR: ++ return "network-cellular"; + case CONNMAN_TYPE_BLUETOOTH: + return "bluetooth"; + } +@@ -220,6 +222,7 @@ static void enabled_technologies_changed(GtkTreeStore *store, GValue *value) + GtkTreeIter iter; + gboolean ethernet_enabled_prev, ethernet_enabled = FALSE; + gboolean wifi_enabled_prev, wifi_enabled = FALSE; ++ gboolean cellular_enabled_prev, cellular_enabled = FALSE; + gchar **tech = g_value_get_boxed (value); + guint i; + +@@ -227,10 +230,13 @@ static void enabled_technologies_changed(GtkTreeStore *store, GValue *value) + return; + + for (i = 0; i < g_strv_length(tech); i++) { ++ DBG("technology: %s", *(tech+i)); + if (g_str_equal("ethernet", *(tech + i))) + ethernet_enabled = TRUE; + else if (g_str_equal ("wifi", *(tech + i))) + wifi_enabled = TRUE; ++ else if (g_str_equal ("cellular", *(tech + i))) ++ cellular_enabled = TRUE; + } + + get_iter_from_type(store, &iter, CONNMAN_TYPE_LABEL_ETHERNET); +@@ -246,6 +252,13 @@ static void enabled_technologies_changed(GtkTreeStore *store, GValue *value) + if (wifi_enabled_prev != wifi_enabled) + gtk_tree_store_set(store, &iter, + CONNMAN_COLUMN_WIFI_ENABLED, wifi_enabled, -1); ++ ++ get_iter_from_type(store, &iter, CONNMAN_TYPE_LABEL_CELLULAR); ++ gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, ++ CONNMAN_COLUMN_CELLULAR_ENABLED, &cellular_enabled_prev, -1); ++ if (cellular_enabled_prev != cellular_enabled) ++ gtk_tree_store_set(store, &iter, ++ CONNMAN_COLUMN_CELLULAR_ENABLED, cellular_enabled, -1); + } + + static void enabled_technologies_properties(GtkTreeStore *store, DBusGProxy *proxy, GValue *value) +@@ -253,14 +266,18 @@ static void enabled_technologies_properties(GtkTreeStore *store, DBusGProxy *pro + GtkTreeIter iter; + gboolean ethernet_enabled = FALSE; + gboolean wifi_enabled = FALSE; ++ gboolean cellular_enabled = FALSE; + gchar **tech = g_value_get_boxed (value); + guint i; + + for (i = 0; i < g_strv_length (tech); i++) { ++ DBG("technology: %s", *(tech+i)); + if (g_str_equal("ethernet", *(tech + i))) + ethernet_enabled = TRUE; + else if (g_str_equal ("wifi", *(tech + i))) + wifi_enabled = TRUE; ++ else if (g_str_equal ("cellular", *(tech + i))) ++ cellular_enabled = TRUE; + } + + if (get_iter_from_type(store, &iter, CONNMAN_TYPE_LABEL_ETHERNET) == FALSE) +@@ -280,6 +297,15 @@ static void enabled_technologies_properties(GtkTreeStore *store, DBusGProxy *pro + CONNMAN_COLUMN_WIFI_ENABLED, wifi_enabled, + CONNMAN_COLUMN_TYPE, CONNMAN_TYPE_LABEL_WIFI, + -1); ++ ++ if (get_iter_from_type(store, &iter, CONNMAN_TYPE_LABEL_CELLULAR) == FALSE) ++ gtk_tree_store_append(store, &iter, NULL); ++ ++ gtk_tree_store_set(store, &iter, ++ CONNMAN_COLUMN_PROXY, proxy, ++ CONNMAN_COLUMN_CELLULAR_ENABLED, cellular_enabled, ++ CONNMAN_COLUMN_TYPE, CONNMAN_TYPE_LABEL_CELLULAR, ++ -1); + } + + static void offline_mode_changed(GtkTreeStore *store, GValue *value) +@@ -497,6 +523,9 @@ static void service_properties(DBusGProxy *proxy, GHashTable *hash, + case CONNMAN_TYPE_WIFI: + label_type = CONNMAN_TYPE_LABEL_WIFI; + break; ++ case CONNMAN_TYPE_CELLULAR: ++ label_type = CONNMAN_TYPE_LABEL_CELLULAR; ++ break; + default: + label_type = CONNMAN_TYPE_UNKNOWN; + break; +diff --git a/icons/connman-type-cellular.png b/icons/connman-type-cellular.png +new file mode 100644 +index 0000000..386abd5 +Binary files /dev/null and b/icons/connman-type-cellular.png differ +diff --git a/properties/Makefile.am b/properties/Makefile.am +index fc1b8c6..30ae442 100644 +--- a/properties/Makefile.am ++++ b/properties/Makefile.am +@@ -1,7 +1,7 @@ + + bin_PROGRAMS = connman-properties + +-connman_properties_SOURCES = main.c advanced.h ethernet.c wifi.c ++connman_properties_SOURCES = main.c advanced.h ethernet.c wifi.c cellular.c + + connman_properties_LDADD = $(top_builddir)/common/libcommon.a \ + @GTK_LIBS@ @DBUS_LIBS@ +diff --git a/properties/advanced.h b/properties/advanced.h +index 79a1c3c..d8f4117 100644 +--- a/properties/advanced.h ++++ b/properties/advanced.h +@@ -59,10 +59,18 @@ struct config_data { + GtkWidget *disconnect; + } wifi; + ++ struct { ++ GtkWidget *name; ++ GtkWidget *strength; ++ GtkWidget *connect_info; ++ GtkWidget *connect; ++ GtkWidget *disconnect; ++ } cellular; ++ + GtkWidget *ethernet_button; + GtkWidget *wifi_button; +- + GtkWidget *scan_button; ++ GtkWidget *cellular_button; + GtkWidget *offline_button; + }; + +@@ -88,8 +96,11 @@ void update_ethernet_ipv4(struct config_data *data, guint policy); + void add_wifi_service(GtkWidget *mainbox, GtkTreeIter *iter, struct config_data *data); + void update_wifi_policy(struct config_data *data, guint policy); + ++void add_cellular_service(GtkWidget *mainbox, GtkTreeIter *iter, struct config_data *data); + void add_ethernet_switch_button(GtkWidget *mainbox, GtkTreeIter *iter, + struct config_data *data); + + void add_wifi_switch_button(GtkWidget *mainbox, GtkTreeIter *iter, + struct config_data *data); ++void add_cellular_switch_button(GtkWidget *mainbox, GtkTreeIter *iter, ++ struct config_data *data); +diff --git a/properties/cellular.c b/properties/cellular.c +new file mode 100644 +index 0000000..7bbfb89 +--- /dev/null ++++ b/properties/cellular.c +@@ -0,0 +1,175 @@ ++/* ++ * ++ * Connection Manager ++ * ++ * Copyright (C) 2011 Intel Corporation. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif ++ ++#include <dbus/dbus-glib.h> ++#include <glib/gi18n.h> ++#include <gtk/gtk.h> ++ ++#include "connman-client.h" ++ ++#include "advanced.h" ++ ++static void connect_reply_cb(DBusGProxy *proxy, GError *error, ++ gpointer user_data) ++{ ++ if (error) ++ g_error_free(error); ++} ++ ++static void connect_callback(GtkWidget *editable, gpointer user_data) ++{ ++ struct config_data *data = user_data; ++ ++ connman_client_connect_async(data->client, data->device, connect_reply_cb, data); ++} ++ ++ ++static void disconnect_callback(GtkWidget *editable, gpointer user_data) ++{ ++ struct config_data *data = user_data; ++ ++ connman_client_disconnect(data->client, data->device); ++} ++ ++static void switch_callback(GtkWidget *editable, gpointer user_data) ++{ ++ struct config_data *data = user_data; ++ const gchar *label = gtk_button_get_label(GTK_BUTTON(data->cellular_button)); ++ ++ if (g_str_equal(label, "Disable")) ++ connman_client_disable_technology(data->client, data->device, "cellular"); ++ else ++ connman_client_enable_technology(data->client, data->device, "cellular"); ++} ++ ++void add_cellular_switch_button(GtkWidget *mainbox, GtkTreeIter *iter, ++ struct config_data *data) ++{ ++ GtkWidget *vbox; ++ GtkWidget *table; ++ GtkWidget *label; ++ GtkWidget *buttonbox; ++ GtkWidget *button; ++ gboolean cellular_enabled; ++ ++ gtk_tree_model_get(data->model, iter, ++ CONNMAN_COLUMN_CELLULAR_ENABLED, &cellular_enabled, ++ -1); ++ ++ vbox = gtk_vbox_new(TRUE, 0); ++ gtk_container_set_border_width(GTK_CONTAINER(vbox), 24); ++ gtk_box_pack_start(GTK_BOX(mainbox), vbox, FALSE, FALSE, 0); ++ ++ table = gtk_table_new(1, 1, TRUE); ++ gtk_table_set_row_spacings(GTK_TABLE(table), 10); ++ gtk_table_set_col_spacings(GTK_TABLE(table), 10); ++ gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0); ++ ++ label = gtk_label_new(_("Configure Cellular Networks.")); ++ gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1); ++ ++ buttonbox = gtk_hbutton_box_new(); ++ gtk_button_box_set_layout(GTK_BUTTON_BOX(buttonbox), GTK_BUTTONBOX_CENTER); ++ gtk_box_pack_start(GTK_BOX(mainbox), buttonbox, FALSE, FALSE, 0); ++ ++ button = gtk_button_new(); ++ data->cellular_button = button; ++ ++ if (cellular_enabled) ++ gtk_button_set_label(GTK_BUTTON(button), _("Disable")); ++ else ++ gtk_button_set_label(GTK_BUTTON(button), _("Enable")); ++ ++ gtk_container_add(GTK_CONTAINER(buttonbox), button); ++ g_signal_connect(G_OBJECT(button), "clicked", ++ G_CALLBACK(switch_callback), data); ++} ++ ++void add_cellular_service(GtkWidget *mainbox, GtkTreeIter *iter, struct config_data *data) ++{ ++ GtkWidget *vbox; ++ GtkWidget *table; ++ GtkWidget *label; ++ GtkWidget *button; ++ ++ const char *name, *icon, *state; ++ guint strength; ++ ++ gtk_tree_model_get(data->model, iter, ++ CONNMAN_COLUMN_NAME, &name, ++ CONNMAN_COLUMN_ICON, &icon, ++ CONNMAN_COLUMN_STATE, &state, ++ CONNMAN_COLUMN_STRENGTH, &strength, ++ -1); ++ ++ if (g_str_equal(state, "failure") == TRUE) ++ connman_client_remove(data->client, data->device); ++ ++ vbox = gtk_vbox_new(TRUE, 0); ++ gtk_container_set_border_width(GTK_CONTAINER(vbox), 24); ++ gtk_box_pack_start(GTK_BOX(mainbox), vbox, FALSE, FALSE, 0); ++ ++ table = gtk_table_new(4, 8, TRUE); ++ gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0); ++ data->table = table; ++ ++ label = gtk_label_new(_("Access Point:")); ++ gtk_table_attach_defaults(GTK_TABLE(table), label, 3, 4, 0, 1); ++ ++ label = gtk_label_new(_(name)); ++ gtk_table_attach_defaults(GTK_TABLE(table), label, 4, 5, 0, 1); ++ gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT); ++ gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); ++ data->cellular.name = label; ++ ++ label = gtk_label_new(_("")); ++ gtk_table_attach_defaults(GTK_TABLE(table), label, 3, 5, 2, 3); ++ gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0); ++ gtk_widget_hide(label); ++ data->cellular.connect_info = label; ++ ++ button = gtk_button_new_with_label(_("Connect")); ++ gtk_table_attach_defaults(GTK_TABLE(table), button, 3, 5, 3, 4); ++ g_signal_connect(G_OBJECT(button), "clicked", ++ G_CALLBACK(connect_callback), data); ++ gtk_widget_set_no_show_all(button, TRUE); ++ data->cellular.connect = button; ++ ++ button = gtk_button_new_with_label(_("Disconnect")); ++ gtk_table_attach_defaults(GTK_TABLE(table), button, 3, 5, 3, 4); ++ g_signal_connect(G_OBJECT(button), "clicked", ++ G_CALLBACK(disconnect_callback), data); ++ data->cellular.disconnect = button; ++ gtk_widget_set_no_show_all(button, TRUE); ++ ++ if (g_str_equal(state, "failure") == TRUE ++ || g_str_equal(state, "idle") == TRUE) { ++ gtk_widget_show(data->cellular.connect); ++ gtk_widget_hide(data->cellular.disconnect); ++ } else { ++ gtk_widget_hide(data->cellular.connect); ++ gtk_widget_show(data->cellular.disconnect); ++ } ++} +diff --git a/properties/main.c b/properties/main.c +index a09c721..ec36aef 100644 +--- a/properties/main.c ++++ b/properties/main.c +@@ -42,6 +42,7 @@ static void status_update(GtkTreeModel *model, GtkTreePath *path, + const char *name = NULL, *_name = NULL, *state = NULL; + gboolean ethernet_enabled; + gboolean wifi_enabled; ++ gboolean cellular_enabled; + gboolean offline_mode; + + gtk_tree_model_get(model, iter, +@@ -50,6 +51,7 @@ static void status_update(GtkTreeModel *model, GtkTreePath *path, + CONNMAN_COLUMN_TYPE, &type, + CONNMAN_COLUMN_ETHERNET_ENABLED, ðernet_enabled, + CONNMAN_COLUMN_WIFI_ENABLED, &wifi_enabled, ++ CONNMAN_COLUMN_CELLULAR_ENABLED, &cellular_enabled, + CONNMAN_COLUMN_OFFLINEMODE, &offline_mode, + -1); + +@@ -75,6 +77,29 @@ static void status_update(GtkTreeModel *model, GtkTreePath *path, + gtk_widget_hide(data->wifi.connect); + gtk_widget_show(data->wifi.disconnect); + } ++ } else if (type == CONNMAN_TYPE_CELLULAR) { ++ if (data->cellular.name) ++ _name = gtk_label_get_text(GTK_LABEL(data->cellular.name)); ++ ++ if (!(name && _name && g_str_equal(name, _name))) ++ return; ++ ++ if (g_str_equal(state, "failure") == TRUE) { ++ gtk_label_set_text(GTK_LABEL(data->cellular.connect_info), ++ _("connection failed")); ++ gtk_widget_show(data->cellular.connect_info); ++ gtk_widget_show(data->cellular.connect); ++ gtk_widget_hide(data->cellular.disconnect); ++ } else if (g_str_equal(state, "idle") == TRUE) { ++ gtk_widget_hide(data->cellular.connect_info); ++ gtk_widget_show(data->cellular.connect); ++ gtk_widget_hide(data->cellular.disconnect); ++ } else { ++ gtk_widget_hide(data->cellular.connect_info); ++ gtk_widget_hide(data->cellular.connect); ++ gtk_widget_show(data->cellular.disconnect); ++ } ++ + } else if (type == CONNMAN_TYPE_LABEL_ETHERNET) { + if (!data->ethernet_button) + return; +@@ -92,6 +117,13 @@ static void status_update(GtkTreeModel *model, GtkTreePath *path, + gtk_button_set_label(GTK_BUTTON(data->wifi_button), _("Enable")); + gtk_widget_set_sensitive(data->scan_button, 0); + } ++ } else if (type == CONNMAN_TYPE_LABEL_CELLULAR) { ++ if (!data->cellular_button) ++ return; ++ if (cellular_enabled) ++ gtk_button_set_label(GTK_BUTTON(data->cellular_button), _("Disable")); ++ else ++ gtk_button_set_label(GTK_BUTTON(data->cellular_button), _("Enable")); + } else if (type == CONNMAN_TYPE_SYSCONFIG) { + if (!data->offline_button) + return; +@@ -100,7 +132,6 @@ static void status_update(GtkTreeModel *model, GtkTreePath *path, + else + gtk_button_set_label(GTK_BUTTON(data->offline_button), _("OfflineMode")); + } +- + } + + static void set_offline_callback(GtkWidget *button, gpointer user_data) +@@ -207,12 +238,18 @@ static struct config_data *create_config(GtkTreeModel *model, + case CONNMAN_TYPE_WIFI: + add_wifi_service(mainbox, iter, data); + break; ++ case CONNMAN_TYPE_CELLULAR: ++ add_cellular_service(mainbox, iter, data); ++ break; + case CONNMAN_TYPE_LABEL_ETHERNET: + add_ethernet_switch_button(mainbox, iter, data); + break; + case CONNMAN_TYPE_LABEL_WIFI: + add_wifi_switch_button(mainbox, iter, data); + break; ++ case CONNMAN_TYPE_LABEL_CELLULAR: ++ add_cellular_switch_button(mainbox, iter, data); ++ break; + case CONNMAN_TYPE_SYSCONFIG: + add_system_config(mainbox, iter, data); + break; +@@ -295,6 +332,7 @@ static void device_to_text(GtkTreeViewColumn *column, GtkCellRenderer *cell, + markup = g_strdup_printf(" %s\n", title); + break; + case CONNMAN_TYPE_WIFI: ++ case CONNMAN_TYPE_CELLULAR: + /* Show the AP name */ + title = N_(name); + if (g_str_equal(state, "association") == TRUE) +@@ -324,6 +362,10 @@ static void device_to_text(GtkTreeViewColumn *column, GtkCellRenderer *cell, + title = N_("Wireless Networks"); + markup = g_strdup_printf("<b>\n%s\n</b>", title); + break; ++ case CONNMAN_TYPE_LABEL_CELLULAR: ++ title = N_("Cellular Networks"); ++ markup = g_strdup_printf("<b>\n%s\n</b>", title); ++ break; + case CONNMAN_TYPE_SYSCONFIG: + title = N_("System Configuration"); + markup = g_strdup_printf("<b>\n%s\n</b>", title); +@@ -362,6 +404,10 @@ static void type_to_icon(GtkTreeViewColumn *column, GtkCellRenderer *cell, + g_object_set(cell, "icon-name", "network-wireless", + "stock-size", 4, NULL); + break; ++ case CONNMAN_TYPE_LABEL_CELLULAR: ++ g_object_set(cell, "icon-name", "network-cellular", ++ "stock-size", 4, NULL); ++ break; + default: + g_object_set(cell, "icon-name", NULL, NULL); + break;
meta/recipes-connectivity/connman/connman-gnome/applet_menu_popup_fix.patch deleted +0 -19
@@ -1,19 +0,0 @@ -Even if all services are not available, we still need to let user have -the ability to configure network, for example, online/offline, etc. -Therefore enable the callback menu even when status is unavailable. - -Signed-off-by: Dongxiao Xu <[email protected]> - -diff --git a/applet/status.c b/applet/status.c -index 13ec752..d817f22 100644 ---- a/applet/status.c -+++ b/applet/status.c -@@ -231,8 +231,6 @@ void status_unavailable(void) - { - icon_animation_stop(animation); - -- available = FALSE; -- - gtk_status_icon_set_from_pixbuf(statusicon, pixbuf_notifier); - gtk_status_icon_set_tooltip(statusicon, - "Connection Manager daemon is not running");
meta/recipes-connectivity/connman/connman-gnome/connman-gnome.patch deleted +0 -4162
2,476 lines not on this page · raw message
meta/recipes-connectivity/connman/connman-gnome/remove-connman-property-desktop-file.patch deleted +0 -42
42 lines not on this page · raw message
meta/recipes-connectivity/connman/connman-gnome/service_name_update.patch deleted +0 -36
Lines of this file are not shown. View the raw message.
meta/recipes-connectivity/connman/connman-gnome_git.bb renamed from meta/recipes-connectivity/connman/connman-gnome_0.5.bb +10 -7
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.7.1
Part of the diff is not shown here. View the raw message.
Shouldn't these be sent to the oe-core list instead?
Op 7 jun 2011, om 10:54 heeft Dongxiao Xu het volgende geschreven:
Quoted 77 lines
Hi Saul,
The following commits enables 3G feature for Yocto Project. Please help to review and pull. (Resend due to error "From" info in previous mail).
Some notes:
a) 0001.patch: Automatically load some kernel modules which is used to support usb network.
b) 0002.patch: upgrade connman to 0.73, also add ofono plugin.
c) 0003.patch: Remove 0.6.10 versio of wpa-supplicant. (This commit is not related with 3G support).
d) 0004.patch: Add 0.42 version of ofono. Because ofonod after 0.42 would crash on Ericsson 3G module.
e) 0005.patch: Add 3G config UI in connman-gnome. Also upgrade it to latest git head.The following changes since commit
7f34cd1eb2a459709006ae985a14decd4d2152e6:tzcode: Update to 2011g (2011-06-06 15:58:42 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contribdxu4/upgrade
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/upgradeDongxiao Xu (5):
kernel.bbclass: Auto load cdc-acm and cdc-wdm
connman: Upgrade to version 0.73
wpa-supplicant: remove the 0.6.10 version.
ofono: add 0.42 version which works OK for Ericsson 3G module.
connman-gnome: Add 3G configuration supportmeta/classes/kernel.bbclass | 2 + meta/conf/distro/include/default-versions.inc | 1 + .../connman-0.65/fix-shutdown-ap-disconnect.patch | 42 - .../add_xuser_dbus_permission.patch | 2 + .../connman/{connman-0.65 => connman-0.73}/connman | 0 .../{connman-0.65 => connman-0.73}/dbusperms.patch | 2 + .../connman/connman-gnome/3g.patch | 505 +++ .../connman-gnome/applet_menu_popup_fix.patch | 19 - .../connman/connman-gnome/connman-gnome.patch | 4162 -------------------- .../remove-connman-property-desktop-file.patch | 42 - .../connman-gnome/service_name_update.patch | 36 - .../{connman-gnome_0.5.bb => connman-gnome_git.bb} | 17 +- meta/recipes-connectivity/connman/connman.inc | 2 +- .../connman/{connman_0.65.bb => connman_0.73.bb} | 8 +- meta/recipes-connectivity/ofono/ofono.inc | 2 + meta/recipes-connectivity/ofono/ofono_0.42.bb | 13 + .../wpa-supplicant-0.6.10/99_wpa_supplicant | 1 - .../wpa-supplicant-0.6.10/defaults-sane | 8 - .../wpa-supplicant-0.6.10/defconfig-0.6.0-gnutls | 180 - .../wpa-supplicant-0.6.10/wpa-supplicant.sh | 85 - .../wpa-supplicant-0.6.10/wpa_supplicant.conf | 690 ---- .../wpa-supplicant-0.6.10/wpa_supplicant.conf-sane | 7 - .../wpa-supplicant/wpa-supplicant-0.6.inc | 83 - .../wpa-supplicant/wpa-supplicant_0.6.10.bb | 4 - 24 files changed, 542 insertions(+), 5371 deletions(-)delete mode 100644
meta/recipes-connectivity/connman/connman-0.65/fix-shutdown-ap-disconnect.patchrename meta/recipes-connectivity/connman/{connman-0.65 =>connman-0.73}/add_xuser_dbus_permission.patch(94%) rename meta/recipes-connectivity/connman/{connman-0.65 => connman-0.73}/connman (100%) rename meta/recipes-connectivity/connman/{connman-0.65 =>connman-0.73}/dbusperms.patch(91%) create mode 100644meta/recipes-connectivity/connman/connman-gnome/3g.patch
delete mode 100644meta/recipes-connectivity/connman/connman-gnome/applet_menu_popup_fix.patchdelete mode 100644meta/recipes-connectivity/connman/connman-gnome/connman-gnome.patchdelete mode 100644meta/recipes-connectivity/connman/connman-gnome/remove-connman-property-desktop-file.patchdelete mode 100644meta/recipes-connectivity/connman/connman-gnome/service_name_update.patchrename meta/recipes-connectivity/connman/{connman-gnome_0.5.bb => connman-gnome_git.bb} (72%) rename meta/recipes-connectivity/connman/{connman_0.65.bb => connman_0.73.bb} (74%)
create mode 100644 meta/recipes-connectivity/ofono/ofono_0.42.bb
delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/99_wpa_supplicant delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/defaults-sane delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/defconfig-0.6.0-gnutls delete mode 100644meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/wpa-supplicant.shdelete mode 100644meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/wpa_supplicant.confdelete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/wpa_supplicant.conf-sane delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.inc
delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.6.10.bb_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky
Re: [poky] [PATCH 2/5] connman: Upgrade to version 0.73
In reply to yOp 7 jun 2011, om 10:54 heeft Dongxiao Xu het volgende geschreven:
Quoted 5 lines
Enable ofono plugin into sato image.
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 <[email protected]>
How different is this from the connman 0.74 in meta-oe?
Quoted 147 lines
---
.../connman-0.65/fix-shutdown-ap-disconnect.patch | 42 -------------------- .../add_xuser_dbus_permission.patch | 2 + .../connman/{connman-0.65 => connman-0.73}/connman | 0 .../{connman-0.65 => connman-0.73}/dbusperms.patch | 2 + meta/recipes-connectivity/connman/connman.inc | 2 +- .../connman/{connman_0.65.bb => connman_0.73.bb} | 8 ++-- 6 files changed, 9 insertions(+), 47 deletions(-)delete mode 100644
meta/recipes-connectivity/connman/connman-0.65/fix-shutdown-ap-disconnect.patchrename meta/recipes-connectivity/connman/{connman-0.65 =>connman-0.73}/add_xuser_dbus_permission.patch(94%) rename meta/recipes-connectivity/connman/{connman-0.65 => connman-0.73}/connman (100%) rename meta/recipes-connectivity/connman/{connman-0.65 =>connman-0.73}/dbusperms.patch(91%) rename meta/recipes-connectivity/connman/{connman_0.65.bb => connman_0.73.bb} (74%)meta/recipes-connectivity/connman/connman-0.65/fix-shutdown-ap-disconnect.patch deleted +0
-42@@ -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 <[email protected]> -Ported by Dongxiao Xu <[email protected]> - -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:meta/recipes-connectivity/connman/connman-0.73/add_xuser_dbus_permission.patch renamed from meta/recipes-connectivity/connman/connman-0.65/add_xuser_dbus_permission.patch +0
-0@@ -1,6 +1,8 @@ Some platform (like atom-pc) enables rootless X,thus we need to add the xuser in the list.
meta/recipes-connectivity/connman/connman-0.73/add_xuser_dbus_permission.patch renamed from meta/recipes-connectivity/connman/connman-0.65/add_xuser_dbus_permission.patch +2
-0+Upstream-Status: Inappropriate [configuration] +Signed-off-by Dongxiao Xu <[email protected]>diff -ruN
connman-0.65-orig/src/connman-dbus.confconnman-0.65/src/connman-dbus.confmeta/recipes-connectivity/connman/connman-0.73/connman renamed from meta/recipes-connectivity/connman/connman-0.65/connman +0
-0meta/recipes-connectivity/connman/connman-0.73/dbusperms.patch renamed from meta/recipes-connectivity/connman/connman-0.65/dbusperms.patch +2
-0@@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] +Index:
git/src/connman-dbus.conf
===================================================================
---git.orig/src/connman-dbus.conf2009-05-26 00:34:35.000000000 +0100meta/recipes-connectivity/connman/connman.inc +0
-0@@ -14,7 +14,7 @@ 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"
meta/recipes-connectivity/connman/connman.inc +1
-1-RDEPENDS_${PN} = "wpa-supplicant resolvconf" +RDEPENDS_${PN} = "wpa-supplicant resolvconf ofono"
INITSCRIPT_NAME= "connman"INITSCRIPT_PARAMS= "start 05 5 2 3 . stop 22 0 1 6 ."meta/recipes-connectivity/connman/connman_0.73.bb renamed from meta/recipes-connectivity/connman/connman_0.65.bb +0
-0@@ -1,5 +1,5 @@require connman.inc
meta/recipes-connectivity/connman/connman_0.73.bb renamed from meta/recipes-connectivity/connman/connman_0.65.bb +1
-1-PR = "r1" +PR = "r0"
EXTRA_OECONF+= "\
ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \meta/recipes-connectivity/connman/connman_0.73.bb renamed from meta/recipes-connectivity/connman/connman_0.65.bb +1
-1@@ -16,14 +16,14 @@ EXTRA_OECONF += "\ --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://fix-shutdown-ap-disconnect.patch \ file://add_xuser_dbus_permission.patch \ file://connman \"
meta/recipes-connectivity/connman/connman_0.73.bb renamed from meta/recipes-connectivity/connman/connman_0.65.bb +2
-2-SRC_URI[md5sum] = "bd714da295ed2d2d91a49539f4c4fa3a" -SRC_URI[sha256sum] = "a1c1d93da6bb4c2d8ae53293b06f237e02f5e796d2bba73ec639a466d05259c3" +SRC_URI[md5sum] = "01085b2ed8f7b11a41724f1528720cc7" +SRC_URI[sha256sum] = "b71ff2c3925ea82a7ebf818685f809e595d5c47d767005dfb149c6264b098417"Signature · 6 lines
1.7.1 _______________________________________________ poky mailing list [email protected] https://lists.yoctoproject.org/listinfo/poky
Re: [PATCH 1/5] kernel.bbclass: Auto load cdc-acm and cdc-wdm
In reply to yQuoted 17 lines · On Tue, Jun 7, 2011 at 4:52 AM, <[email protected]> wrote:
From: Dongxiao Xu <[email protected]>
Automatically load cdc-acm.ko and cdc-wdm.ko to support 3G module.
Signed-off-by Dongxiao Xu <[email protected]>---
meta/classes/kernel.bbclass | 2 ++1 files changed, 2 insertions(+), 0 deletions(-)meta/classes/kernel.bbclass +0
-0@@ -264,6 +264,8 @@ module_autoload_rfcomm = "rfcomm"module_autoload_sa1100-rtc = "sa1100-rtc"
# sa1100-rtc was renamed in 2.6.23 onwards module_autoload_rtc-sa1100 = "rtc-sa1100"
meta/classes/kernel.bbclass module_autoload_rfcomm = "rfcomm" · line 268
Quoted 2 lines
meta/classes/kernel.bbclass +2
-0+module_autoload_cdc-acm = "cdc-acm" +module_autoload_cdc-wdm = "cdc-wdm"
Hi Dongxiao,
This patch should go to oe-core, since we are talking about meta/classes/kernel.bbclass.
But seeing this looks like it doesn't belong in kernel.bbclass at all (neither do the existing autoloads), but would be better defined in either a BSP or distro layer.
But maybe I'm missing something, and I'll be enlightened shortly :)
Cheers,
Bruce
Quoted 11 lines
# alias defaults (alphabetically sorted) module_conf_af_packet = "alias net-pf-17 af_packet" -- 1.7.1_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky
Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"
Re: [PATCH 1/5] kernel.bbclass: Auto load cdc-acm and cdc-wdm
Quoted 23 lines · Bruce Ashfield
Quoted 14 lines · On Tue, Jun 7, 2011 at 4:52 AM, <[email protected]> wrote:
From: Dongxiao Xu <[email protected]>
Automatically load cdc-acm.ko and cdc-wdm.ko to support 3G module.
Signed-off-by Dongxiao Xu <[email protected]>--- meta/classes/kernel.bbclass | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)meta/classes/kernel.bbclass +0
-0meta/classes/kernel.bbclass module_autoload_rfcomm = "rfcomm" · line 268
Quoted 5 lines
meta/classes/kernel.bbclass +2
-0@@ -264,6 +264,8 @@ module_autoload_rfcomm = "rfcomm" module_autoload_sa1100-rtc = "sa1100-rtc" # sa1100-rtc was renamed in 2.6.23 onwards module_autoload_rtc-sa1100 = "rtc-sa1100" +module_autoload_cdc-acm = "cdc-acm" +module_autoload_cdc-wdm = "cdc-wdm"Hi Dongxiao,
Quoted 6 lines
This patch should go to oe-core, since we are talking about meta/classes/kernel.bbclass.
But seeing this looks like it doesn't belong in kernel.bbclass at all (neither do the existing autoloads), but would be better defined in either a BSP or distro layer.
Agreed.
Signature · 3 lines
Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel
Re: [PATCH 1/5] kernel.bbclass: Auto load cdc-acm and cdc-wdm
Op 7 jun 2011, om 18:05 heeft Darren Hart het volgende geschreven:
Quoted 26 lines · Bruce Ashfield
Quoted 23 lines · On Tue, Jun 7, 2011 at 4:52 AM, <[email protected]> wrote:
Quoted 17 lines
From: Dongxiao Xu <[email protected]>
Automatically load cdc-acm.ko and cdc-wdm.ko to support 3G module.
Signed-off-by Dongxiao Xu <[email protected]>---
meta/classes/kernel.bbclass | 2 ++1 files changed, 2 insertions(+), 0 deletions(-)meta/classes/kernel.bbclass +0
-0@@ -264,6 +264,8 @@ module_autoload_rfcomm = "rfcomm"module_autoload_sa1100-rtc = "sa1100-rtc"
# sa1100-rtc was renamed in 2.6.23 onwards module_autoload_rtc-sa1100 = "rtc-sa1100"meta/classes/kernel.bbclass module_autoload_rfcomm = "rfcomm" · line 268
Quoted 2 lines
meta/classes/kernel.bbclass +2
-0+module_autoload_cdc-acm = "cdc-acm" +module_autoload_cdc-wdm = "cdc-wdm"Hi Dongxiao,
Quoted 8 lines
Quoted 6 lines
This patch should go to oe-core, since we are talking about meta/classes/kernel.bbclass.
But seeing this looks like it doesn't belong in kernel.bbclass at all (neither do the existing autoloads), but would be better defined in either a BSP or distro layer.
Agreed.
And more importantly, figure out why those don't get autoloaded when plugging in such usb devices.
regards,
Koen