diff options
| -rw-r--r-- | meta/recipes-connectivity/connman/connman.inc | 6 | ||||
| -rw-r--r-- | 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 e90aa4b02a..d695fee218 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 \ | |||
| 14 | file://src/main.c;beginline=1;endline=20;md5=4b55b550fa6b33cc2055ef30dd262b3e" | 14 | file://src/main.c;beginline=1;endline=20;md5=4b55b550fa6b33cc2055ef30dd262b3e" |
| 15 | 15 | ||
| 16 | # we need to define the depends here, the dynamic stuff is too late | 16 | # we need to define the depends here, the dynamic stuff is too late |
| 17 | DEPENDS = "dbus glib-2.0 ppp iptables gnutls ntp \ | 17 | DEPENDS = "dbus glib-2.0 ppp iptables gnutls \ |
| 18 | ${@base_contains('DISTRO_FEATURES', 'bluetooth','bluez4', '', d)} \ | 18 | ${@base_contains('DISTRO_FEATURES', 'bluetooth','bluez4', '', d)} \ |
| 19 | ${@base_contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \ | 19 | ${@base_contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \ |
| 20 | " | 20 | " |
| @@ -36,8 +36,7 @@ EXTRA_OECONF += "\ | |||
| 36 | --disable-polkit \ | 36 | --disable-polkit \ |
| 37 | --enable-client \ | 37 | --enable-client \ |
| 38 | --enable-fake \ | 38 | --enable-fake \ |
| 39 | --enable-ntpd \ | 39 | --disable-ntpd \ |
| 40 | --with-ntpd=${bindir}/ntpd \ | ||
| 41 | " | 40 | " |
| 42 | 41 | ||
| 43 | INITSCRIPT_NAME = "connman" | 42 | INITSCRIPT_NAME = "connman" |
| @@ -72,7 +71,6 @@ python populate_packages_prepend() { | |||
| 72 | wifi="wpa-supplicant", | 71 | wifi="wpa-supplicant", |
| 73 | resolvconf="resolvconf", | 72 | resolvconf="resolvconf", |
| 74 | bluetooth="bluez4", | 73 | bluetooth="bluez4", |
| 75 | ntpd="ntp", | ||
| 76 | ofono="ofono" ) | 74 | ofono="ofono" ) |
| 77 | packages = [] | 75 | packages = [] |
| 78 | multilib_prefix = (d.getVar("MLPREFIX", True) or "") | 76 | 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 cc23c2871f..5ea2bb7ef2 100644 --- a/meta/recipes-connectivity/connman/connman_0.78.bb +++ b/meta/recipes-connectivity/connman/connman_0.78.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require connman.inc | 1 | require connman.inc |
| 2 | 2 | ||
| 3 | PR = "r1" | 3 | PR = "r2" |
| 4 | 4 | ||
| 5 | # 0.78 tag | 5 | # 0.78 tag |
| 6 | SRCREV = "02f5d5fe2d7c71514a6387ba2b772b42d8e8d297" | 6 | SRCREV = "02f5d5fe2d7c71514a6387ba2b772b42d8e8d297" |
