summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorPeter A. Bigot <pab@pabigot.com>2015-02-16 17:06:20 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-17 13:43:39 +0000
commit8633e18d28558085573e887869ec32fd91003032 (patch)
tree2330e0e56f055a8c068fd5046a17c0410d93c998 /meta/recipes-connectivity
parent7800588e992e27cec801bca3fe8a174fcb366d45 (diff)
downloadpoky-8633e18d28558085573e887869ec32fd91003032.tar.gz
connman: depend on distro provider of bluez
connman currently supports both bluez4 and bluez5 without distinguishing them at configuration time. (From OE-Core rev: 420ab90167e434d6972702c44271104881f08fc9) Signed-off-by: Peter A. Bigot <pab@pabigot.com> Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/connman/connman.inc8
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 736b324704..1062641cec 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -13,6 +13,8 @@ LICENSE = "GPLv2"
13LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ 13LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
14 file://src/main.c;beginline=1;endline=20;md5=486a279a6ab0c8d152bcda3a5b5edc36" 14 file://src/main.c;beginline=1;endline=20;md5=486a279a6ab0c8d152bcda3a5b5edc36"
15 15
16inherit bluetooth
17
16DEPENDS = "dbus glib-2.0 ppp iptables" 18DEPENDS = "dbus glib-2.0 ppp iptables"
17 19
18INC_PR = "r20" 20INC_PR = "r20"
@@ -32,7 +34,7 @@ EXTRA_OECONF += "\
32PACKAGECONFIG ??= "wispr \ 34PACKAGECONFIG ??= "wispr \
33 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd','systemd', '', d)} \ 35 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd','systemd', '', d)} \
34 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wifi', '', d)} \ 36 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wifi', '', d)} \
35 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth','bluetooth', '', d)} \ 37 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
36 ${@bb.utils.contains('DISTRO_FEATURES', '3g','3g', '', d)} \ 38 ${@bb.utils.contains('DISTRO_FEATURES', '3g','3g', '', d)} \
37" 39"
38 40
@@ -42,7 +44,7 @@ PACKAGECONFIG ??= "wispr \
42 44
43PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir=" 45PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir="
44PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant" 46PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant"
45PACKAGECONFIG[bluetooth] = "--enable-bluetooth, --disable-bluetooth, bluez4" 47PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, ${BLUEZ}"
46PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono" 48PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono"
47PACKAGECONFIG[tist] = "--enable-tist,--disable-tist," 49PACKAGECONFIG[tist] = "--enable-tist,--disable-tist,"
48PACKAGECONFIG[openvpn] = "--enable-openvpn --with-openvpn=${sbindir}/openvpn,--disable-openvpn,,openvpn" 50PACKAGECONFIG[openvpn] = "--enable-openvpn --with-openvpn=${sbindir}/openvpn,--disable-openvpn,,openvpn"
@@ -114,7 +116,7 @@ RPROVIDES_${PN} = "\
114 116
115RDEPENDS_${PN} = "\ 117RDEPENDS_${PN} = "\
116 dbus \ 118 dbus \
117 ${@bb.utils.contains('PACKAGECONFIG', 'bluetooth', 'bluez4', '', d)} \ 119 ${@bb.utils.contains('PACKAGECONFIG', 'bluetooth', '${BLUEZ}', '', d)} \
118 ${@bb.utils.contains('PACKAGECONFIG', 'wifi','wpa-supplicant', '', d)} \ 120 ${@bb.utils.contains('PACKAGECONFIG', 'wifi','wpa-supplicant', '', d)} \
119 ${@bb.utils.contains('PACKAGECONFIG', '3g','ofono', '', d)} \ 121 ${@bb.utils.contains('PACKAGECONFIG', '3g','ofono', '', d)} \
120 xuser-account \ 122 xuser-account \