summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/connman
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2010-12-30 09:52:10 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-30 12:07:29 +0000
commit2bf07e7e9d3f818913c0347f13e1ab582ab97f16 (patch)
treefacd7488c3ff821cb725703b4ed80c033efea2b0 /meta/recipes-connectivity/connman
parenta6faa8fb195b3080f9ca802c95ff85bf89563446 (diff)
downloadpoky-2bf07e7e9d3f818913c0347f13e1ab582ab97f16.tar.gz
connman-gnome: update service name
Since connman-0.64, the D-BUS service name changed from "org.moblin.connman" domain to the "net.connman" one. Thus change connman-gnome accordingly. This fixes [BUGID #619]. Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Diffstat (limited to 'meta/recipes-connectivity/connman')
-rw-r--r--meta/recipes-connectivity/connman/connman-gnome/service_name_update.patch36
-rw-r--r--meta/recipes-connectivity/connman/connman-gnome_0.5.bb5
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 @@
1diff -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"
13diff -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;
25diff -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"
8DEPENDS = "gtk+ dbus" 8DEPENDS = "gtk+ dbus"
9PR = "r2" 9PR = "r3"
10 10
11RRECOMMENDS_${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" 11RRECOMMENDS_${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
13SRC_URI = "http://www.kernel.org/pub/linux/network/connman/connman-gnome-${PV}.tar.gz \ 13SRC_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
17SRC_URI[md5sum] = "0e1c4c25d19cad9b08a216848a320716" 18SRC_URI[md5sum] = "0e1c4c25d19cad9b08a216848a320716"
18SRC_URI[sha256sum] = "4d5fe481b444fc3e64fd9caa149dbcd76de166a25733f18fd93da01d2abf5d1c" 19SRC_URI[sha256sum] = "4d5fe481b444fc3e64fd9caa149dbcd76de166a25733f18fd93da01d2abf5d1c"