connman: disable ntp support

OE-Core does not provide ntpd at this moment and as there's no known
user of this plugin at this moment we are disabling it.

[YOCTO #1817]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index e90aa4b02a112042d4aab62d4ffa97f27cc23631..d695fee218dcd8260f48018585225f4cc836b58d 100644 (file)
--- 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"
 
 # we need to define the depends here, the dynamic stuff is too late
-DEPENDS  = "dbus glib-2.0 ppp iptables gnutls ntp \
+DEPENDS  = "dbus glib-2.0 ppp iptables gnutls \
             ${@base_contains('DISTRO_FEATURES', 'bluetooth','bluez4', '', d)} \
             ${@base_contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \
             "
@@ -36,8 +36,7 @@ EXTRA_OECONF += "\
     --disable-polkit \
     --enable-client \
     --enable-fake \
-    --enable-ntpd \
-    --with-ntpd=${bindir}/ntpd \
+    --disable-ntpd \
 "
 
 INITSCRIPT_NAME = "connman"
@@ -72,7 +71,6 @@ python populate_packages_prepend() {
                       wifi="wpa-supplicant",
                       resolvconf="resolvconf",
                       bluetooth="bluez4",
-                      ntpd="ntp",
                       ofono="ofono" )
        packages = []
        multilib_prefix = (d.getVar("MLPREFIX", True) or "")

diff --git a/meta/recipes-connectivity/connman/connman_0.78.bb b/meta/recipes-connectivity/connman/connman_0.78.bb
index cc23c2871f579a543f620e871363dfe2d97c5e69..5ea2bb7ef246e6387cdf978efb05ed6593107982 100644 (file)
--- a/meta/recipes-connectivity/connman/connman_0.78.bb
+++ b/meta/recipes-connectivity/connman/connman_0.78.bb
@@ -1,6 +1,6 @@
 require connman.inc
 
-PR = "r1"
+PR = "r2"
 
 # 0.78 tag
 SRCREV = "02f5d5fe2d7c71514a6387ba2b772b42d8e8d297"