Patchwork connman: disable ntp support

login
register
mail settings
Submitter Otavio Salvador
Date Dec. 9, 2011, 6:54 p.m.
Message ID <1323456842-16941-1-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/16611/
State Accepted
Commit c67d7c9215bd8af2b5dcc4a72b6edf00157724d5
Headers show

Comments

Otavio Salvador - Dec. 9, 2011, 6:54 p.m.
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>
---
 meta/recipes-connectivity/connman/connman.inc     |    6 ++----
 meta/recipes-connectivity/connman/connman_0.78.bb |    2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)
Koen Kooi - Dec. 9, 2011, 7:09 p.m.
Op 9 dec. 2011, om 19:54 heeft Otavio Salvador het volgende geschreven:

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

Ehm:

koen@dominion:/OE/tentacle/sources/meta-angstrom$ git grep connman-plugin-ntpd
recipes-angstrom/tasks/angstrom-task-gnome.bb:  connman-gnome connman-plugin-ntpd \
recipes-angstrom/tasks/angstrom-task-gnome3.bb:  connman-gnome connman-plugin-ntpd \

That being said, the upcoming simplentpd conmman feature is a lot better. But I'd appreciate a patch for meta-angstrom to remove the ntp plugin :)

> 
> [YOCTO #1817]
> 
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
> meta/recipes-connectivity/connman/connman.inc     |    6 ++----
> meta/recipes-connectivity/connman/connman_0.78.bb |    2 +-
> 2 files changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
> index e90aa4b..d695fee 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"
> 
> # 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 cc23c28..5ea2bb7 100644
> --- 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"
> -- 
> 1.7.2.5
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Darren Hart - Dec. 9, 2011, 7:12 p.m.
On 12/09/2011 10:54 AM, Otavio Salvador wrote:
> 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>

| checking linux/if_alg.h usability... no
| checking linux/if_alg.h presence... no
| checking for linux/if_alg.h... no
| configure: error: User-space algorithm header files are required
| ERROR: oe_runconf failed
NOTE: package connman-0.78-r2: task do_configure: Failed

Not sure if it's related, but connman still doesn't build for me with
this patch applied.

--
Darren

> ---
>  meta/recipes-connectivity/connman/connman.inc     |    6 ++----
>  meta/recipes-connectivity/connman/connman_0.78.bb |    2 +-
>  2 files changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
> index e90aa4b..d695fee 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"
>  
>  # 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 cc23c28..5ea2bb7 100644
> --- 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"
Otavio Salvador - Dec. 9, 2011, 7:18 p.m.
On Fri, Dec 9, 2011 at 17:12, Darren Hart <dvhart@linux.intel.com> wrote:

> | checking linux/if_alg.h usability... no
> | checking linux/if_alg.h presence... no
> | checking for linux/if_alg.h... no
> | configure: error: User-space algorithm header files are required
> | ERROR: oe_runconf failed
> NOTE: package connman-0.78-r2: task do_configure: Failed
>
> Not sure if it's related, but connman still doesn't build for me with
> this patch applied.
>

It builds fine for x86 and arm7 here.

Patch

diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index e90aa4b..d695fee 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"
 
 # 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 cc23c28..5ea2bb7 100644
--- 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"