summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter A. Bigot <pab@pabigot.com>2015-02-16 17:06:15 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-17 13:43:39 +0000
commit47dea140699fbd862f62ff552fd58bb838929422 (patch)
tree3a8a173f25f8fecf963d4fb688701d16f52f80cd
parent0a4db94942920cff01a14cfb4cfccb4af6c160a3 (diff)
downloadpoky-47dea140699fbd862f62ff552fd58bb838929422.tar.gz
neard: select distro preference for bluez provider
(From OE-Core rev: 33b3164c2627d20315ff716e7d78ced86871c472) Signed-off-by: Peter A. Bigot <pab@pabigot.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/neard/neard.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/neard/neard.inc b/meta/recipes-connectivity/neard/neard.inc
index 31bc6ddb66..6b6b1da8c1 100644
--- a/meta/recipes-connectivity/neard/neard.inc
+++ b/meta/recipes-connectivity/neard/neard.inc
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
9 file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \ 9 file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \
10 " 10 "
11 11
12inherit autotools pkgconfig systemd update-rc.d 12inherit autotools pkgconfig systemd update-rc.d bluetooth
13 13
14PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" 14PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
15 15
@@ -45,7 +45,7 @@ RDEPENDS_${PN} = "dbus python python-dbus python-pygobject"
45 45
46# Bluez & Wifi are not mandatory except for handover 46# Bluez & Wifi are not mandatory except for handover
47RRECOMMENDS_${PN} = "\ 47RRECOMMENDS_${PN} = "\
48 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \ 48 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \
49 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \ 49 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \
50 " 50 "
51 51