diff options
| author | Peter A. Bigot <pab@pabigot.com> | 2015-02-16 17:06:20 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-17 13:42:21 +0000 |
| commit | 420ab90167e434d6972702c44271104881f08fc9 (patch) | |
| tree | 1830053860737d708a73650f93538cf7338ab4dc /meta/recipes-connectivity | |
| parent | 11354dd5b8e4a6005dff6d52eeb7aae59a9c3ac3 (diff) | |
| download | openembedded-core-420ab90167e434d6972702c44271104881f08fc9.tar.gz openembedded-core-420ab90167e434d6972702c44271104881f08fc9.tar.bz2 openembedded-core-420ab90167e434d6972702c44271104881f08fc9.zip | |
connman: depend on distro provider of bluez
connman currently supports both bluez4 and bluez5 without distinguishing
them at configuration time.
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.inc | 8 |
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" LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://src/main.c;beginline=1;endline=20;md5=486a279a6ab0c8d152bcda3a5b5edc36" +inherit bluetooth + DEPENDS = "dbus glib-2.0 ppp iptables" INC_PR = "r20" @@ -32,7 +34,7 @@ EXTRA_OECONF += "\ PACKAGECONFIG ??= "wispr \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd','systemd', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wifi', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth','bluetooth', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', '3g','3g', '', d)} \ " @@ -42,7 +44,7 @@ PACKAGECONFIG ??= "wispr \ PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir=" PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant" -PACKAGECONFIG[bluetooth] = "--enable-bluetooth, --disable-bluetooth, bluez4" +PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, ${BLUEZ}" PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono" PACKAGECONFIG[tist] = "--enable-tist,--disable-tist," PACKAGECONFIG[openvpn] = "--enable-openvpn --with-openvpn=${sbindir}/openvpn,--disable-openvpn,,openvpn" @@ -114,7 +116,7 @@ RPROVIDES_${PN} = "\ RDEPENDS_${PN} = "\ dbus \ - ${@bb.utils.contains('PACKAGECONFIG', 'bluetooth', 'bluez4', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'bluetooth', '${BLUEZ}', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'wifi','wpa-supplicant', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', '3g','ofono', '', d)} \ xuser-account \ |