Skip to contentSkip to conversation

3G network support

GIT PULL New Dongxiao Xu 2 participants 8 messages Jun 29, 2011

lore
Share & tools
lore
#0 lore raw

Hi,

This is the 4th version of 3G patches, please help to review and pull.

Changes from v3:
1) Use DISTRO_FEATURE to handle the dependency of ofono.
2) Adopt ofono 0.50 version which could work with Ericsson modem. (ofono's commit d99ca17 fixed the crash issue)

Thanks,
Dongxiao

The following changes since commit a4f3e006e1f2fd93f156012af2a05adccf41d065:

u-boot-mkimage: bump version to 2011.03 (2011-06-28 17:13:19 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib dxu4/ggg-v4
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/ggg-v4

Dongxiao Xu (6):
connman: Upgrade to version 0.75
wpa-supplicant: remove the 0.6.10 version.
ofono: upgrade to version 0.50
connman-gnome: Add 3G configuration support
initscript: Change some order of init scripts
task-base: add 3G into DISTRO_FEATURE

 meta/conf/distro/include/default-distrovars.inc    |    2 +-
 meta/conf/distro/include/default-versions.inc      |    4 -
 .../connman-0.65/fix-shutdown-ap-disconnect.patch  |   42 --
 .../add_xuser_dbus_permission.patch                |    2 +
 .../connman/{connman-0.65 => connman-0.75}/connman |    0
 .../{connman-0.65 => connman-0.75}/dbusperms.patch |    2 +
 .../connman/connman-gnome/3g.patch                 |  505 ++++++++++++++
 .../connman/connman-gnome_0.5.bb                   |    8 +-
 meta/recipes-connectivity/connman/connman.inc      |   14 +-
 .../connman/{connman_0.65.bb => connman_0.75.bb}   |    8 +-
 meta/recipes-connectivity/ofono/ofono.inc          |    2 +
 meta/recipes-connectivity/ofono/ofono_0.45.bb      |    9 -
 meta/recipes-connectivity/ofono/ofono_0.50.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 -
 meta/recipes-core/initscripts/initscripts_1.0.bb   |    6 +-
 meta/recipes-core/tasks/task-base.bb               |   16 +-
 meta/recipes-core/udev/udev-new.inc                |    2 +-
 meta/recipes-core/udev/udev_164.bb                 |    2 +-
 .../modutils/modutils-initscripts.bb               |    4 +-
 26 files changed, 568 insertions(+), 1131 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.75}/add_xuser_dbus_permission.patch (94%)
 rename meta/recipes-connectivity/connman/{connman-0.65 => connman-0.75}/connman (100%)
 rename meta/recipes-connectivity/connman/{connman-0.65 => connman-0.75}/dbusperms.patch (91%)
 create mode 100644 meta/recipes-connectivity/connman/connman-gnome/3g.patch
 rename meta/recipes-connectivity/connman/{connman_0.65.bb => connman_0.75.bb} (74%)
 delete mode 100644 meta/recipes-connectivity/ofono/ofono_0.45.bb
 create mode 100644 meta/recipes-connectivity/ofono/ofono_0.50.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.bb
#1 lore raw

PATCH 1/6 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.

---
 .../connman-0.65/fix-shutdown-ap-disconnect.patch  |   42 --------------------
 .../add_xuser_dbus_permission.patch                |    2 +
 .../connman/{connman-0.65 => connman-0.75}/connman |    0
 .../{connman-0.65 => connman-0.75}/dbusperms.patch |    2 +
 meta/recipes-connectivity/connman/connman.inc      |   14 ++++++-
 .../connman/{connman_0.65.bb => connman_0.75.bb}   |    8 ++--
 6 files changed, 20 insertions(+), 48 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.75}/add_xuser_dbus_permission.patch (94%)
 rename meta/recipes-connectivity/connman/{connman-0.65 => connman-0.75}/connman (100%)
 rename meta/recipes-connectivity/connman/{connman-0.65 => connman-0.75}/dbusperms.patch (91%)
 rename meta/recipes-connectivity/connman/{connman_0.65.bb => connman_0.75.bb} (74%)
meta/recipes-connectivity/connman/connman-0.65/fix-shutdown-ap-disconnect.patch deleted +0 -42
deleted file mode 100644
index a0ad099..0000000
@@ -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.75/add_xuser_dbus_permission.patch renamed from meta/recipes-connectivity/connman/connman-0.65/add_xuser_dbus_permission.patch +2 -0
similarity index 94%
rename from meta/recipes-connectivity/connman/connman-0.65/add_xuser_dbus_permission.patch
rename to meta/recipes-connectivity/connman/connman-0.75/add_xuser_dbus_permission.patch
index 787d49b..764c689 100644
@@ -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.75/connman renamed from meta/recipes-connectivity/connman/connman-0.65/connman +0 -0
similarity index 100%
rename from meta/recipes-connectivity/connman/connman-0.65/connman
rename to meta/recipes-connectivity/connman/connman-0.75/connman
meta/recipes-connectivity/connman/connman-0.75/dbusperms.patch renamed from meta/recipes-connectivity/connman/connman-0.65/dbusperms.patch +2 -0
similarity index 91%
rename from meta/recipes-connectivity/connman/connman-0.65/dbusperms.patch
rename to meta/recipes-connectivity/connman/connman-0.75/dbusperms.patch
index 100af03..c331654 100644
@@ -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 +12 -2
index fb970ed..ccff573 100644
@@ -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)
 }
meta/recipes-connectivity/connman/connman_0.75.bb renamed from meta/recipes-connectivity/connman/connman_0.65.bb +4 -4
similarity index 74%
rename from meta/recipes-connectivity/connman/connman_0.65.bb
rename to meta/recipes-connectivity/connman/connman_0.75.bb
index 852f8dc..75ef5b5 100644
@@ -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] = "9973cb89a11fff6b51fc85b51c13b711"
+SRC_URI[sha256sum] = "b15361237f7ec8092fb0e55d4585550ab35491485edaf10ddd032d6e36299db7"
Signature · 1 line
1.7.1
#2 lore raw

PATCH 2/6 wpa-supplicant: remove the 0.6.10 version.

In reply to Dongxiao Xu

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
deleted file mode 100644
index 6ff4dd8..0000000
@@ -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
deleted file mode 100644
index 67c4cbd..0000000
@@ -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
deleted file mode 100644
index c91ffe0..0000000
@@ -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
deleted file mode 100644
index 0dff55a..0000000
@@ -1,4 +0,0 @@
-require wpa-supplicant-0.6.inc
-
-PE = "1"
-PR = "r0"
Signature · 1 line
1.7.1
#3 lore raw

PATCH 3/6 ofono: upgrade to version 0.50

In reply to Dongxiao Xu
---
 meta/conf/distro/include/default-versions.inc |    4 ----
 meta/recipes-connectivity/ofono/ofono.inc     |    2 ++
 meta/recipes-connectivity/ofono/ofono_0.45.bb |    9 ---------
 meta/recipes-connectivity/ofono/ofono_0.50.bb |   13 +++++++++++++
 4 files changed, 15 insertions(+), 13 deletions(-)
 delete mode 100644 meta/recipes-connectivity/ofono/ofono_0.45.bb
 create mode 100644 meta/recipes-connectivity/ofono/ofono_0.50.bb
meta/conf/distro/include/default-versions.inc +0 -4
index 0abbd8f..377aba5 100644
@@ -12,7 +12,3 @@ 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"
-
-
-
-
meta/recipes-connectivity/ofono/ofono.inc +2 -0
index ee3bc3e..4fc969c 100644
@@ -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.45.bb deleted +0 -9
deleted file mode 100644
index 4a8950f..0000000
@@ -1,9 +0,0 @@
-require ofono.inc
-
-PR = "r0"
-
-SRC_URI  = "${KERNELORG_MIRROR}/linux/network/ofono/${P}.tar.bz2 \
-	          file://ofono"
-
-SRC_URI[md5sum] = "31dabb077e7592ba36913bd9d0c76b94"
-SRC_URI[sha256sum] = "5541e832fb72c6c647b663e5ee55384a33efaee5a34c4544e3a16af94892f47e"
meta/recipes-connectivity/ofono/ofono_0.50.bb new file +13 -0
new file mode 100644
index 0000000..eb82e39
@@ -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] = "b2656fd0bbf33f926fc86c1e8915d697"
+SRC_URI[sha256sum] = "f8f8dd917847a007e4d441b949efc4d28dc3644526d5293016844c2536c65ff9"
Signature · 1 line
1.7.1
#4 lore raw

PATCH 4/6 connman-gnome: Add 3G configuration support

In reply to Dongxiao Xu

Apply 3g.patch which add cellular config option in connman-gnome.

---
 .../connman/connman-gnome/3g.patch                 |  505 ++++++++++++++++++++
 .../connman/connman-gnome_0.5.bb                   |    8 +-
 2 files changed, 510 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-connectivity/connman/connman-gnome/3g.patch
meta/recipes-connectivity/connman/connman-gnome/3g.patch new file +505 -0
new file mode 100644
index 0000000..c73c1ea
@@ -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, &ethernet_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_0.5.bb +5 -3
index 69b2d5b..69c5930 100644
@@ -6,12 +6,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
                     file://properties/main.c;beginline=1;endline=20;md5=50c77c81871308b033ab7a1504626afb \
                     file://common/connman-dbus.c;beginline=1;endline=20;md5=de6b485c0e717a0236402d220187717a"
 DEPENDS = "gtk+ dbus"
-PR = "r5"
+PR = "r6"
 
-RRECOMMENDS_${PN} = "python python-dbus connman connman-plugin-ethernet connman-plugin-loopback connman-plugin-udhcp connman-plugin-wifi connman-plugin-fake connman-plugin-bluetooth connman-plugin-dnsproxy"
+RRECOMMENDS_${PN} = "python python-dbus connman connman-plugin-ethernet connman-plugin-loopback connman-plugin-udhcp connman-plugin-wifi connman-plugin-fake connman-plugin-bluetooth connman-plugin-dnsproxy connman-plugin-ofono"
 
 SRCREV = "78d3c39db6f3f7977b466305110faa8ca5f74ec8"
-SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman-gnome.git;protocol=git"
+SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman-gnome.git;protocol=git \
+           file://3g.patch"
+
 S = "${WORKDIR}/git"
 
 inherit autotools gtk-icon-cache
Signature · 1 line
1.7.1
#5 lore raw

PATCH 5/6 initscript: Change some order of init scripts

In reply to Dongxiao Xu

Move udev script to execute ealier since module autoload needs it to create device nodes.

Also move sysfs before udev which has dependency on it.

---
 meta/recipes-core/initscripts/initscripts_1.0.bb   |    6 +++---
 meta/recipes-core/udev/udev-new.inc                |    2 +-
 meta/recipes-core/udev/udev_164.bb                 |    2 +-
 .../modutils/modutils-initscripts.bb               |    4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)
meta/recipes-core/initscripts/initscripts_1.0.bb +3 -3
index 48b65b9..9e535af 100644
@@ -4,7 +4,7 @@ SECTION = "base"
 PRIORITY = "required"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-PR = "r126"
+PR = "r127"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
@@ -119,8 +119,8 @@ do_install () {
 	ln -sf		../init.d/bootmisc.sh	${D}${sysconfdir}/rcS.d/S55bootmisc.sh
 #	ln -sf		../init.d/urandom	${D}${sysconfdir}/rcS.d/S55urandom
 #	ln -sf		../init.d/finish.sh	${D}${sysconfdir}/rcS.d/S99finish.sh
-	# udev will run at S04 if installed
-	ln -sf		../init.d/sysfs.sh	${D}${sysconfdir}/rcS.d/S03sysfs.sh
+	ln -sf		../init.d/sysfs.sh	${D}${sysconfdir}/rcS.d/S02sysfs.sh
+	# udev will run at S03 if installed
 	ln -sf		../init.d/populate-volatile.sh	${D}${sysconfdir}/rcS.d/S37populate-volatile.sh
 	ln -sf		../init.d/devpts.sh	${D}${sysconfdir}/rcS.d/S38devpts.sh
 	if [ "${TARGET_ARCH}" = "arm" ]; then
meta/recipes-core/udev/udev-new.inc +1 -1
index 1b94f1b..4c4451f 100644
@@ -40,7 +40,7 @@ PACKAGES =+ "libgudev libgudev-dev libgudev-dbg"
 
 INITSCRIPT_PACKAGES = "udev udev-cache"
 INITSCRIPT_NAME_udev = "udev"
-INITSCRIPT_PARAMS_udev = "start 04 S ."
+INITSCRIPT_PARAMS_udev = "start 03 S ."
 INITSCRIPT_NAME_udev-cache = "udev-cache"
 INITSCRIPT_PARAMS_udev-cache = "start 36 S ."
 
meta/recipes-core/udev/udev_164.bb +1 -1
index 76fd907..567e62e 100644
@@ -1,6 +1,6 @@
 include udev-new.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI[md5sum] = "fddac2d54761ea34865af9467377ca9f"
 SRC_URI[sha256sum] = "c12e66280b5e1465f6587a8cfa47d7405c4caa7e52ce5dd13478d04f6ec05e5c"
meta/recipes-kernel/modutils/modutils-initscripts.bb +2 -2
index 5ae34b4..89d38cf 100644
@@ -4,10 +4,10 @@ LICENSE = "PD"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7bf87fc37976e93ec66ad84fac58c098"
 SRC_URI = "file://modutils.sh \
 	   file://PD.patch"
-PR = "r5"
+PR = "r6"
 
 INITSCRIPT_NAME = "modutils.sh"
-INITSCRIPT_PARAMS = "start 2 S ."
+INITSCRIPT_PARAMS = "start 4 S ."
 
 inherit update-rc.d
 
Signature · 1 line
1.7.1
#6 lore raw

PATCH 6/6 task-base: add 3G into DISTRO_FEATURE

In reply to Dongxiao Xu
---
 meta/conf/distro/include/default-distrovars.inc |    2 +-
 meta/recipes-core/tasks/task-base.bb            |   16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)
meta/conf/distro/include/default-distrovars.inc +1 -1
index 2cde46c..2f36f59 100644
@@ -17,7 +17,7 @@ DISTRO_FEATURES_LIBC ?= "ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-t
 					libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \
 					libc-posix-wchar-io"
 
-DISTRO_FEATURES ?= "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci ${DISTRO_FEATURES_LIBC}"
+DISTRO_FEATURES ?= "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci 3g ${DISTRO_FEATURES_LIBC}"
 
 IMAGE_FEATURES ?= ""
 
meta/recipes-core/tasks/task-base.bb +15 -1
index a2a8925..3ff57ff 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/p
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r70"
+PR = "r71"
 
 inherit task
 
@@ -35,6 +35,7 @@ PACKAGES = ' \
 	    \
             ${@base_contains("DISTRO_FEATURES", "bluetooth", "task-base-bluetooth", "", d)} \
             ${@base_contains("DISTRO_FEATURES", "wifi", "task-base-wifi", "", d)} \
+            ${@base_contains("DISTRO_FEATURES", "3g", "task-base-3g", "", d)} \
             ${@base_contains("DISTRO_FEATURES", "cramfs", "task-base-cramfs", "", d)} \
             ${@base_contains("DISTRO_FEATURES", "ipsec", "task-base-ipsec", "", d)} \
             ${@base_contains("DISTRO_FEATURES", "ipv6", "task-base-ipv6", "", d)} \
@@ -95,6 +96,7 @@ RDEPENDS_task-base = "\
     ${@base_contains('COMBINED_FEATURES', 'usbhost', 'task-base-usbhost', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'task-base-bluetooth', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'wifi', 'task-base-wifi', '',d)} \
+    ${@base_contains('COMBINED_FEATURES', '3g', 'task-base-3g', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'uboot', 'task-base-uboot', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'redboot', 'task-base-redboot', '',d)} \
     ${@base_contains('COMBINED_FEATURES', 'apex', 'task-base-apex', '',d)} \
@@ -114,10 +116,12 @@ RDEPENDS_task-base-extended = "\
     task-base \
     ${ADD_WIFI} \
     ${ADD_BT} \
+    ${ADD_3G} \
     "
 
 ADD_WIFI = ""
 ADD_BT = ""
+ADD_3G = ""
 
 python __anonymous () {
     # If Distro want wifi and machine feature wifi/pci/pcmcia/usbhost (one of them)
@@ -133,6 +137,9 @@ python __anonymous () {
 
     if "wifi" in distro_features and not "wifi" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features):
 	bb.data.setVar("ADD_WIFI", "task-base-wifi", d)
+
+    if "3g" in distro_features and not "3g" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features):
+	bb.data.setVar("ADD_3G", "task-base-3g", d)
 }
 
 #
@@ -339,6 +346,13 @@ RRECOMMENDS_task-base-wifi = "\
     kernel-module-aes-generic \
     kernel-module-aes"
 
+RDEPENDS_task-base-3g = "\
+    ofono"
+
+RRECOMMENDS_task-base-3g = "\
+    kernel-module-cdc-acm \
+    kernel-module-cdc-wdm"
+
 RRECOMMENDS_task-base-smbfs = "\
     kernel-module-cifs \
     kernel-module-smbfs"
Signature · 1 line
1.7.1
#7 lore raw
In reply to Dongxiao Xu
Quoted 20 lines · Dongxiao Xu

Hi,

This is the 4th version of 3G patches, please help to review and pull.

Changes from v3:
1) Use DISTRO_FEATURE to handle the dependency of ofono.
2) Adopt ofono 0.50 version which could work with Ericsson modem. (ofono's commit d99ca17 fixed the crash issue)

Thanks,
Dongxiao

The following changes since commit a4f3e006e1f2fd93f156012af2a05adccf41d065:

u-boot-mkimage: bump version to 2011.03 (2011-06-28 17:13:19 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib dxu4/ggg-v4
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/ggg-v4

Quoted 7 lines

Dongxiao Xu (6):
connman: Upgrade to version 0.75
wpa-supplicant: remove the 0.6.10 version.
ofono: upgrade to version 0.50
connman-gnome: Add 3G configuration support
initscript: Change some order of init scripts
task-base: add 3G into DISTRO_FEATURE

These look good to me, merged to masterm thanks!

Richard