2 files changed, 39 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/connman/connman-gnome/service_name_update.patch b/meta/recipes-connectivity/connman/connman-gnome/service_name_update.patch
new file mode 100644
index 0000000000..942cfc883c
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman-gnome/service_name_update.patch
@@ -0,0 +1,36 @@
+diff -ruN connman-gnome-0.5-orig/common/connman-dbus.h connman-gnome-0.5/common/connman-dbus.h
+--- connman-gnome-0.5-orig/common/connman-dbus.h        2010-12-30 09:45:03.312043457 +0800
+++ connman-gnome-0.5/common/connman-dbus.h     2010-12-30 09:45:33.978499439 +0800
+@@ -22,7 +22,7 @@
+ #include <dbus/dbus-glib.h>
+ #include <gtk/gtk.h>
+ 
+-#define CONNMAN_SERVICE                        "org.moblin.connman"
+#define CONNMAN_SERVICE                        "net.connman"
+ 
+ #define CONNMAN_ERROR_INTERFACE                CONNMAN_SERVICE ".Error"
+ #define CONNMAN_AGENT_INTERFACE                CONNMAN_SERVICE ".Agent"
+diff -ruN connman-gnome-0.5-orig/common/instance.c connman-gnome-0.5/common/instance.c
+--- connman-gnome-0.5-orig/common/instance.c    2010-12-30 09:45:03.316085542 +0800
+++ connman-gnome-0.5/common/instance.c 2010-12-30 09:46:01.654479049 +0800
+@@ -29,7 +29,7 @@
+ 
+ #include "instance.h"
+ 
+-#define CONNMAN_SERVICE    "org.moblin.connman"
+#define CONNMAN_SERVICE    "net.connman"
+ #define CONNMAN_INSTANCE   CONNMAN_SERVICE ".Instance"
+ 
+ static DBusGConnection *connection;
+diff -ruN connman-gnome-0.5-orig/common/instance.xml connman-gnome-0.5/common/instance.xml
+--- connman-gnome-0.5-orig/common/instance.xml  2010-12-30 09:45:03.312043457 +0800
+++ connman-gnome-0.5/common/instance.xml       2010-12-30 09:45:49.868372780 +0800
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8" ?>
+ 
+ <node name="/">
+-  <interface name="org.moblin.connman.Instance">
+  <interface name="net.connman.Instance">
+     <method name="Present">
+     </method>
+   </interface>
diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.5.bb b/meta/recipes-connectivity/connman/connman-gnome_0.5.bb
index 9dd1b4179f..3b7d1b8f58 100644
--- a/meta/recipes-connectivity/connman/connman-gnome_0.5.bb
+++ b/meta/recipes-connectivity/connman/connman-gnome_0.5.bb
@@ -6,13 +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 = "r2"
+PR = "r3"
 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"
 SRC_URI = "http://www.kernel.org/pub/linux/network/connman/connman-gnome-${PV}.tar.gz \
           file://connman-gnome.patch \
-           file://remove-connman-property-desktop-file.patch"
+           file://remove-connman-property-desktop-file.patch \
+           file://service_name_update.patch"
 SRC_URI[md5sum] = "0e1c4c25d19cad9b08a216848a320716"
 SRC_URI[sha256sum] = "4d5fe481b444fc3e64fd9caa149dbcd76de166a25733f18fd93da01d2abf5d1c"

diff --git a/meta/recipes-connectivity/connman/connman-gnome/service_name_update.patch b/meta/recipes-connectivity/connman/connman-gnome/service_name_update.patch new file mode 100644 index 0000000000..942cfc883c --- /dev/null +++ b/meta/recipes-connectivity/connman/connman-gnome/service_name_update.patch
@@ -0,0 +1,36 @@
		1	diff -ruN connman-gnome-0.5-orig/common/connman-dbus.h connman-gnome-0.5/common/connman-dbus.h
		2	--- connman-gnome-0.5-orig/common/connman-dbus.h 2010-12-30 09:45:03.312043457 +0800
		3	+++ connman-gnome-0.5/common/connman-dbus.h 2010-12-30 09:45:33.978499439 +0800
		4	@@ -22,7 +22,7 @@
		5	#include <dbus/dbus-glib.h>
		6	#include <gtk/gtk.h>
		7
		8	-#define CONNMAN_SERVICE "org.moblin.connman"
		9	+#define CONNMAN_SERVICE "net.connman"
		10
		11	#define CONNMAN_ERROR_INTERFACE CONNMAN_SERVICE ".Error"
		12	#define CONNMAN_AGENT_INTERFACE CONNMAN_SERVICE ".Agent"
		13	diff -ruN connman-gnome-0.5-orig/common/instance.c connman-gnome-0.5/common/instance.c
		14	--- connman-gnome-0.5-orig/common/instance.c 2010-12-30 09:45:03.316085542 +0800
		15	+++ connman-gnome-0.5/common/instance.c 2010-12-30 09:46:01.654479049 +0800
		16	@@ -29,7 +29,7 @@
		17
		18	#include "instance.h"
		19
		20	-#define CONNMAN_SERVICE "org.moblin.connman"
		21	+#define CONNMAN_SERVICE "net.connman"
		22	#define CONNMAN_INSTANCE CONNMAN_SERVICE ".Instance"
		23
		24	static DBusGConnection *connection;
		25	diff -ruN connman-gnome-0.5-orig/common/instance.xml connman-gnome-0.5/common/instance.xml
		26	--- connman-gnome-0.5-orig/common/instance.xml 2010-12-30 09:45:03.312043457 +0800
		27	+++ connman-gnome-0.5/common/instance.xml 2010-12-30 09:45:49.868372780 +0800
		28	@@ -1,7 +1,7 @@
		29	<?xml version="1.0" encoding="UTF-8" ?>
		30
		31	<node name="/">
		32	- <interface name="org.moblin.connman.Instance">
		33	+ <interface name="net.connman.Instance">
		34	<method name="Present">
		35	</method>
		36	</interface>


diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.5.bb b/meta/recipes-connectivity/connman/connman-gnome_0.5.bb index 9dd1b4179f..3b7d1b8f58 100644 --- a/meta/recipes-connectivity/connman/connman-gnome_0.5.bb +++ b/meta/recipes-connectivity/connman/connman-gnome_0.5.bb
@@ -6,13 +6,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
6	file://properties/main.c;beginline=1;endline=20;md5=50c77c81871308b033ab7a1504626afb \	6	file://properties/main.c;beginline=1;endline=20;md5=50c77c81871308b033ab7a1504626afb \
7	file://common/connman-dbus.c;beginline=1;endline=20;md5=de6b485c0e717a0236402d220187717a"	7	file://common/connman-dbus.c;beginline=1;endline=20;md5=de6b485c0e717a0236402d220187717a"
8	DEPENDS = "gtk+ dbus"	8	DEPENDS = "gtk+ dbus"
9	PR = "r2"	9	PR = "r3"
10		10
11	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"	11	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"
12		12
13	SRC_URI = "http://www.kernel.org/pub/linux/network/connman/connman-gnome-${PV}.tar.gz \	13	SRC_URI = "http://www.kernel.org/pub/linux/network/connman/connman-gnome-${PV}.tar.gz \
14	file://connman-gnome.patch \	14	file://connman-gnome.patch \
15	file://remove-connman-property-desktop-file.patch"	15	file://remove-connman-property-desktop-file.patch \
		16	file://service_name_update.patch"
16		17
17	SRC_URI[md5sum] = "0e1c4c25d19cad9b08a216848a320716"	18	SRC_URI[md5sum] = "0e1c4c25d19cad9b08a216848a320716"
18	SRC_URI[sha256sum] = "4d5fe481b444fc3e64fd9caa149dbcd76de166a25733f18fd93da01d2abf5d1c"	19	SRC_URI[sha256sum] = "4d5fe481b444fc3e64fd9caa149dbcd76de166a25733f18fd93da01d2abf5d1c"