diff options
| author |   Dongxiao Xu <dongxiao.xu@intel.com> | 2010-12-30 09:52:10 +0800 |
|---|---|---|
| committer |   Richard Purdie <rpurdie@linux.intel.com> | 2010-12-30 12:07:29 +0000 |
| commit | 2bf07e7e9d3f818913c0347f13e1ab582ab97f16 (patch) | |
| tree | facd7488c3ff821cb725703b4ed80c033efea2b0 /meta/recipes-connectivity | |
| parent | a6faa8fb195b3080f9ca802c95ff85bf89563446 (diff) | |
| download | openembedded-core-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')
| -rw-r--r-- | meta/recipes-connectivity/connman/connman-gnome/service_name_update.patch | 36 | ||||
| -rw-r--r-- | meta/recipes-connectivity/connman/connman-gnome_0.5.bb | 5 |
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" |