From 2d994bb8560c83e0444869ba189b46a1a8094a12 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Wed, 8 Jun 2011 15:26:13 +0200
Subject: [PATCH] connman 0.74: enable ntp plugin

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta-oe/recipes-connectivity/connman/connman.inc     | 4 ++--
 meta-oe/recipes-connectivity/connman/connman_0.74.bb | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/meta-oe/recipes-connectivity/connman/connman.inc b/meta-oe/recipes-connectivity/connman/connman.inc
index 7dd30fc211..c0cdf7b4ce 100644
--- a/meta-oe/recipes-connectivity/connman/connman.inc
+++ b/meta-oe/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"
 
 # 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"
+DEPENDS  = "libnl wpa-supplicant dbus glib-2.0 ppp busybox dhcp resolvconf bluez4 iptables gnutls ntp"
 
 EXTRA_OECONF += "\
     ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \
@@ -46,7 +46,7 @@ do_install_append() {
 }
 
 python populate_packages_prepend() {
-	depmap = dict( pppd="ppp", udhcp="busybox connman-scripts", dhclient="dhcp-client", wifi="wpa-supplicant", resolvconf="resolvconf", bluetooth="bluez4" )
+	depmap = dict( pppd="ppp", udhcp="busybox connman-scripts", dhclient="dhcp-client", wifi="wpa-supplicant", resolvconf="resolvconf", bluetooth="bluez4", ntpd="ntp" )
 	packages = []
 	hook = lambda file,pkg,b,c,d:packages.append((file,pkg))
 	plugin_dir = bb.data.expand('${libdir}/connman/plugins/', d)
diff --git a/meta-oe/recipes-connectivity/connman/connman_0.74.bb b/meta-oe/recipes-connectivity/connman/connman_0.74.bb
index 7d6630e87d..7e29487670 100644
--- a/meta-oe/recipes-connectivity/connman/connman_0.74.bb
+++ b/meta-oe/recipes-connectivity/connman/connman_0.74.bb
@@ -1,5 +1,7 @@
 require connman.inc
 
+PR = "r1"
+
 EXTRA_OECONF += "\
   --disable-gtk-doc \
   --enable-debug \
@@ -7,15 +9,14 @@ EXTRA_OECONF += "\
   --enable-loopback \
   --enable-ethernet \
   --enable-wifi \
-  --disable-wimax \
   --enable-bluetooth \
   --enable-ofono \
-  --enable-resolvconf \
-  --enable-dnsproxy \
   --enable-tools \
   --disable-polkit \
   --enable-client \
   --enable-fake \
+  --enable-ntpd \
+  --with-ntpd=${bindir}/ntpd \
 "
 
 SRC_URI  = "\