Patchwork [1/6] connman: Upgrade to version 0.75

login
register
mail settings
Submitter Dongxiao Xu
Date June 16, 2011, 9:20 a.m.
Message ID <f590848e2802c1ecd7faedb6f695b8b5203c7aa8.1308215406.git.dongxiao.xu@intel.com>
Download mbox | patch
Permalink /patch/6011/
State New, archived
Headers show

Comments

Dongxiao Xu - June 16, 2011, 9:20 a.m.
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 <dongxiao.xu@intel.com>
---
 .../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      |    2 +-
 .../connman/{connman_0.65.bb => connman_0.75.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.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%)
Phil Blundell - June 16, 2011, 9:35 a.m.
On Thu, 2011-06-16 at 17:20 +0800, Dongxiao Xu wrote:
> Enable ofono plugin into sato image.

[...]

> --- a/meta/recipes-connectivity/connman/connman.inc
> +++ b/meta/recipes-connectivity/connman/connman.inc
> @@ -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"

> --- a/meta/recipes-connectivity/connman/connman_0.65.bb
> +++ b/meta/recipes-connectivity/connman/connman_0.75.bb
> @@ -16,14 +16,14 @@ EXTRA_OECONF += "\
>    --disable-udev \
>    --disable-polkit \
>    --enable-client \
> +  --enable-ofono \
>    --prefix=/usr --sysconfdir=/etc --localstatedir=/var"

These changes look like they will have a rather wider impact than just
the sato image.  I'm not sufficiently au fait with connman to say
whether this is a good thing or not (although my immediate reaction to
adding extra RDEPENDS tends to be that it is not), but if they're going
to be added globally then the checkin comment ought to reflect that and
explain why it's being done.  Alternatively, you could do this in your
distro layer and/or image recipes.

p.
Koen Kooi - June 16, 2011, 9:42 a.m.
Op 16 jun 2011, om 11:20 heeft Dongxiao Xu het volgende geschreven:

> 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.

I asked before, but I'll ask again, have you looked at the connman recipe in meta-oe?

Also consider turning on the tools, but that needs a more recent linux-libc-headers.
Paul Eggleton - June 16, 2011, 10:36 a.m.
On Thursday 16 June 2011 10:35:25 Phil Blundell wrote:
> These changes look like they will have a rather wider impact than just
> the sato image.  I'm not sufficiently au fait with connman to say
> whether this is a good thing or not (although my immediate reaction to
> adding extra RDEPENDS tends to be that it is not), but if they're going
> to be added globally then the checkin comment ought to reflect that and
> explain why it's being done.

Dongxiao, I'm somewhat in agreement in that I don't think we want to force 
ofono to be installed for people who only need connman. Ofono support in 
connman is a plugin, so we should be able to have this as a separate sub-
package and then make only that depend on ofono.

Cheers,
Paul
Koen Kooi - June 16, 2011, 10:55 a.m.
Op 16 jun 2011, om 12:36 heeft Paul Eggleton het volgende geschreven:

> On Thursday 16 June 2011 10:35:25 Phil Blundell wrote:
>> These changes look like they will have a rather wider impact than just
>> the sato image.  I'm not sufficiently au fait with connman to say
>> whether this is a good thing or not (although my immediate reaction to
>> adding extra RDEPENDS tends to be that it is not), but if they're going
>> to be added globally then the checkin comment ought to reflect that and
>> explain why it's being done.
> 
> Dongxiao, I'm somewhat in agreement in that I don't think we want to force 
> ofono to be installed for people who only need connman. Ofono support in 
> connman is a plugin, so we should be able to have this as a separate sub-
> package and then make only that depend on ofono.

Have a look at connman in meta-oe, that has some nice plugin goodies.
Khem Raj - June 16, 2011, 1:44 p.m.
On 6/16/2011 2:35 AM, Phil Blundell wrote:
> On Thu, 2011-06-16 at 17:20 +0800, Dongxiao Xu wrote:
>> Enable ofono plugin into sato image.
>
> [...]
>
>> --- a/meta/recipes-connectivity/connman/connman.inc
>> +++ b/meta/recipes-connectivity/connman/connman.inc
>> @@ -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"
>
>> --- a/meta/recipes-connectivity/connman/connman_0.65.bb
>> +++ b/meta/recipes-connectivity/connman/connman_0.75.bb
>> @@ -16,14 +16,14 @@ EXTRA_OECONF += "\
>>     --disable-udev \
>>     --disable-polkit \
>>     --enable-client \
>> +  --enable-ofono \
>>     --prefix=/usr --sysconfdir=/etc --localstatedir=/var"
>
> These changes look like they will have a rather wider impact than just
> the sato image.  I'm not sufficiently au fait with connman to say
> whether this is a good thing or not (although my immediate reaction to
> adding extra RDEPENDS tends to be that it is not), but if they're going
> to be added globally then the checkin comment ought to reflect that and
> explain why it's being done.  Alternatively, you could do this in your
> distro layer and/or image recipes.
>

I would say put ofono as a DISTRO_FEATURE

> p.
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Phil Blundell - June 16, 2011, 1:52 p.m.
On Thu, 2011-06-16 at 06:44 -0700, Khem Raj wrote:
> I would say put ofono as a DISTRO_FEATURE

Yeah, that might make sense.

p.
Koen Kooi - June 16, 2011, 2 p.m.
Op 16 jun 2011, om 15:44 heeft Khem Raj het volgende geschreven:

> On 6/16/2011 2:35 AM, Phil Blundell wrote:
>> On Thu, 2011-06-16 at 17:20 +0800, Dongxiao Xu wrote:
>>> Enable ofono plugin into sato image.
>> 
>> [...]
>> 
>>> --- a/meta/recipes-connectivity/connman/connman.inc
>>> +++ b/meta/recipes-connectivity/connman/connman.inc
>>> @@ -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"
>> 
>>> --- a/meta/recipes-connectivity/connman/connman_0.65.bb
>>> +++ b/meta/recipes-connectivity/connman/connman_0.75.bb
>>> @@ -16,14 +16,14 @@ EXTRA_OECONF += "\
>>>    --disable-udev \
>>>    --disable-polkit \
>>>    --enable-client \
>>> +  --enable-ofono \
>>>    --prefix=/usr --sysconfdir=/etc --localstatedir=/var"
>> 
>> These changes look like they will have a rather wider impact than just
>> the sato image.  I'm not sufficiently au fait with connman to say
>> whether this is a good thing or not (although my immediate reaction to
>> adding extra RDEPENDS tends to be that it is not), but if they're going
>> to be added globally then the checkin comment ought to reflect that and
>> explain why it's being done.  Alternatively, you could do this in your
>> distro layer and/or image recipes.
>> 
> 
> I would say put ofono as a DISTRO_FEATURE

You don't need to build ofono to have ofono support in connman. Angstrom (and hence meta-oe) build with it enabled by default to support people who want to use the plugin on their phones. Since it's a nicely seperated plugin, DISTRO_FEATURE would be the wrong thing to do.

That's why I keep saying "look at the connman recipe in meta-oe", that's being used by angstrom and SHR with good success.

regards,

Koen
Khem Raj - June 16, 2011, 11:12 p.m.
On 06/16/2011 07:00 AM, Koen Kooi wrote:
>
> Op 16 jun 2011, om 15:44 heeft Khem Raj het volgende geschreven:
>
>> On 6/16/2011 2:35 AM, Phil Blundell wrote:
>>> On Thu, 2011-06-16 at 17:20 +0800, Dongxiao Xu wrote:
>>>> Enable ofono plugin into sato image.
>>>
>>> [...]
>>>
>>>> --- a/meta/recipes-connectivity/connman/connman.inc
>>>> +++ b/meta/recipes-connectivity/connman/connman.inc
>>>> @@ -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"
>>>
>>>> --- a/meta/recipes-connectivity/connman/connman_0.65.bb
>>>> +++ b/meta/recipes-connectivity/connman/connman_0.75.bb
>>>> @@ -16,14 +16,14 @@ EXTRA_OECONF += "\
>>>>     --disable-udev \
>>>>     --disable-polkit \
>>>>     --enable-client \
>>>> +  --enable-ofono \
>>>>     --prefix=/usr --sysconfdir=/etc --localstatedir=/var"
>>>
>>> These changes look like they will have a rather wider impact than just
>>> the sato image.  I'm not sufficiently au fait with connman to say
>>> whether this is a good thing or not (although my immediate reaction to
>>> adding extra RDEPENDS tends to be that it is not), but if they're going
>>> to be added globally then the checkin comment ought to reflect that and
>>> explain why it's being done.  Alternatively, you could do this in your
>>> distro layer and/or image recipes.
>>>
>>
>> I would say put ofono as a DISTRO_FEATURE
>
> You don't need to build ofono to have ofono support in connman. Angstrom (and hence meta-oe) build with it enabled by default to support people who want to use the plugin on their phones. Since it's a nicely seperated plugin,

even better

  DISTRO_FEATURE would be the wrong thing to do.

in such case DISTRO_FEATURE might be secondary choice yes

>
> That's why I keep saying "look at the connman recipe in meta-oe", that's being used by angstrom and SHR with good success.
>
> regards,
>
> Koen
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Dongxiao Xu - June 17, 2011, 7:08 a.m.
> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> Khem Raj
> Sent: Friday, June 17, 2011 7:13 AM
> To: openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH 1/6] connman: Upgrade to version 0.75
> 
> On 06/16/2011 07:00 AM, Koen Kooi wrote:
> >
> > Op 16 jun 2011, om 15:44 heeft Khem Raj het volgende geschreven:
> >
> >> On 6/16/2011 2:35 AM, Phil Blundell wrote:
> >>> On Thu, 2011-06-16 at 17:20 +0800, Dongxiao Xu wrote:
> >>>> Enable ofono plugin into sato image.
> >>>
> >>> [...]
> >>>
> >>>> --- a/meta/recipes-connectivity/connman/connman.inc
> >>>> +++ b/meta/recipes-connectivity/connman/connman.inc
> >>>> @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM =
> "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
> >>>>
> file://src/main.c;beginline=1;endline=20;md5=4b55b550fa6b33cc2055ef30dd2
> 62b3e"
> >>>>
> >>>>   DEPENDS  = "libgdbus dbus glib-2.0 hal iptables"
> >>>> -RDEPENDS_${PN} = "wpa-supplicant resolvconf"
> >>>> +RDEPENDS_${PN} = "wpa-supplicant resolvconf ofono"
> >>>
> >>>> --- a/meta/recipes-connectivity/connman/connman_0.65.bb
> >>>> +++ b/meta/recipes-connectivity/connman/connman_0.75.bb
> >>>> @@ -16,14 +16,14 @@ EXTRA_OECONF += "\
> >>>>     --disable-udev \
> >>>>     --disable-polkit \
> >>>>     --enable-client \
> >>>> +  --enable-ofono \
> >>>>     --prefix=/usr --sysconfdir=/etc --localstatedir=/var"
> >>>
> >>> These changes look like they will have a rather wider impact than
> >>> just the sato image.  I'm not sufficiently au fait with connman to
> >>> say whether this is a good thing or not (although my immediate
> >>> reaction to adding extra RDEPENDS tends to be that it is not), but
> >>> if they're going to be added globally then the checkin comment ought
> >>> to reflect that and explain why it's being done.  Alternatively, you
> >>> could do this in your distro layer and/or image recipes.

Yes, the description in commit is not accurate and I will modify it.
Also globally add ofono in connman's RDEPENDS is not good enough. In actual, it is connman-plugin-ofono who rdepends on ofono recipe.
I will revise it in next version of pull request.

> >>>
> >>
> >> I would say put ofono as a DISTRO_FEATURE
> >
> > You don't need to build ofono to have ofono support in connman.
> > Angstrom (and hence meta-oe) build with it enabled by default to
> > support people who want to use the plugin on their phones. Since it's
> > a nicely seperated plugin,

Do you mean connman-plugin-ofono could work correctly without the ofono recipe?
According to my understanding, connman-plugin-ofono controls the telephony device by talking with ofonod daemon through dbus mechanism.
On another aspect, ofono project has support for different types of modems, and I don't think connman-plugin-ofono has the ability.
Therefore I think the ofono recipe is needed.

> 
> even better
> 
>   DISTRO_FEATURE would be the wrong thing to do.
> 
> in such case DISTRO_FEATURE might be secondary choice yes
> 
> >
> > That's why I keep saying "look at the connman recipe in meta-oe", that's
> being used by angstrom and SHR with good success.

Thanks Koen for the information.
It has good mechanism to add RDEPENDS to specific connman plugin.
I will include this logic in my next pull request.

Thanks,
Dongxiao
 
> >
> > regards,
> >
> > Koen
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Koen Kooi - June 17, 2011, 7:15 a.m.
Op 17 jun 2011, om 09:08 heeft Xu, Dongxiao het volgende geschreven:
> 
>>>>> 
>>>> 
>>>> I would say put ofono as a DISTRO_FEATURE
>>> 
>>> You don't need to build ofono to have ofono support in connman.
>>> Angstrom (and hence meta-oe) build with it enabled by default to
>>> support people who want to use the plugin on their phones. Since it's
>>> a nicely seperated plugin,
> 
> Do you mean connman-plugin-ofono could work correctly without the ofono recipe?
> According to my understanding, connman-plugin-ofono controls the telephony device by talking with ofonod daemon through dbus mechanism.
> On another aspect, ofono project has support for different types of modems, and I don't think connman-plugin-ofono has the ability.
> Therefore I think the ofono recipe is needed.

I'm saying that ofono is not a *build* dependency for the connman-ofono plugin.

regards,

Koen
Dongxiao Xu - June 21, 2011, 1:36 a.m.
Hi Koen,

> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> Koen Kooi
> Sent: Friday, June 17, 2011 3:15 PM
> To: Patches and discussions about the oe-core layer
> Subject: Re: [OE-core] [PATCH 1/6] connman: Upgrade to version 0.75
> 
> 
> Op 17 jun 2011, om 09:08 heeft Xu, Dongxiao het volgende geschreven:
> >
> >>>>>
> >>>>
> >>>> I would say put ofono as a DISTRO_FEATURE
> >>>
> >>> You don't need to build ofono to have ofono support in connman.
> >>> Angstrom (and hence meta-oe) build with it enabled by default to
> >>> support people who want to use the plugin on their phones. Since
> >>> it's a nicely seperated plugin,
> >
> > Do you mean connman-plugin-ofono could work correctly without the ofono
> recipe?
> > According to my understanding, connman-plugin-ofono controls the telephony
> device by talking with ofonod daemon through dbus mechanism.
> > On another aspect, ofono project has support for different types of modems,
> and I don't think connman-plugin-ofono has the ability.
> > Therefore I think the ofono recipe is needed.
> 
> I'm saying that ofono is not a *build* dependency for the connman-ofono
> plugin.

Yes we don't need ofono to build connman or connman-plugin-ofono, but we need to assign ofono as RDEPENDS of connman-plugin-ofono by the following logic:

python populate_packages_prepend() {
        depmap = dict( wifi="wpa-supplicant", resolvconf="resolvconf", 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='', 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)
}

Since we didn't assign ofono as any direct build/runtime dependency of connman. Therefore we will face a problem that, while doing rootfs, ofono is not built out while connman-plugin-ofono has runtime dependency on it, and it will cause do_rootfs error.

I saw in meta-oe, there are following lines, I understand it as a workaround to handle the late added rdepends.

# we need to define the depends here, the dynamic stuff is too late
DEPENDS  = "libnl wpa-supplicant dbus glib-2.0 ppp busybox dhcp resolvconf bluez4 iptables gnutls ntp"

Therefore I think we also need to add ofono in the DEPENDS line to solve our problem.

Thanks,
Dongxiao


> 
> regards,
> 
> Koen
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-connectivity/connman/connman-0.65/fix-shutdown-ap-disconnect.patch b/meta/recipes-connectivity/connman/connman-0.65/fix-shutdown-ap-disconnect.patch
deleted file mode 100644
index a0ad099..0000000
--- a/meta/recipes-connectivity/connman/connman-0.65/fix-shutdown-ap-disconnect.patch
+++ /dev/null
@@ -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 <sameo@linux.intel.com>
-Ported by Dongxiao Xu <dongxiao.xu@intel.com>
-
-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:
diff --git a/meta/recipes-connectivity/connman/connman-0.65/add_xuser_dbus_permission.patch b/meta/recipes-connectivity/connman/connman-0.75/add_xuser_dbus_permission.patch
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
--- a/meta/recipes-connectivity/connman/connman-0.65/add_xuser_dbus_permission.patch
+++ b/meta/recipes-connectivity/connman/connman-0.75/add_xuser_dbus_permission.patch
@@ -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 <dongxiao.xu@intel.com>
 
 diff -ruN connman-0.65-orig/src/connman-dbus.conf connman-0.65/src/connman-dbus.conf
diff --git a/meta/recipes-connectivity/connman/connman-0.65/connman b/meta/recipes-connectivity/connman/connman-0.75/connman
similarity index 100%
rename from meta/recipes-connectivity/connman/connman-0.65/connman
rename to meta/recipes-connectivity/connman/connman-0.75/connman
diff --git a/meta/recipes-connectivity/connman/connman-0.65/dbusperms.patch b/meta/recipes-connectivity/connman/connman-0.75/dbusperms.patch
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
--- a/meta/recipes-connectivity/connman/connman-0.65/dbusperms.patch
+++ b/meta/recipes-connectivity/connman/connman-0.75/dbusperms.patch
@@ -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
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index fb970ed..f6565a5 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -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 ."
diff --git a/meta/recipes-connectivity/connman/connman_0.65.bb b/meta/recipes-connectivity/connman/connman_0.75.bb
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
--- a/meta/recipes-connectivity/connman/connman_0.65.bb
+++ b/meta/recipes-connectivity/connman/connman_0.75.bb
@@ -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"