summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-16 17:06:21 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-17 13:43:39 +0000
commitd8d5feee2ab48ea15112242a7f5bf79a1fcfb2e9 (patch)
treee589411a6f4729339800f5853eb6a42313cdda89 /meta/conf
parent8633e18d28558085573e887869ec32fd91003032 (diff)
downloadpoky-d8d5feee2ab48ea15112242a7f5bf79a1fcfb2e9.tar.gz
default-providers: Set the preferred provider for bluez based on version
bitbake will currently 'selecting bluez4 to satisfy runtime libasound-module-bluez due to PREFERRED_PROVIDER_bluez4 = bluez4' which in the case of bluez5 isn't correct. This slightly unusual construct avoids this. Ultimately this is a bitbake issue that needs fixing in a better way but this means we can merge the bluez5 changes until bitbake gets fixed. (From OE-Core rev: ef41f4b91d65f87850edd6cc56ca37d2ecb56378) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/distro/include/default-providers.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index 25118fa378..8d92c2e362 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -43,7 +43,7 @@ PREFERRED_PROVIDER_make ?= "make"
43PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','udev',d)}" 43PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','udev',d)}"
44# There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details 44# There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details
45# on this rather strange entry. 45# on this rather strange entry.
46PREFERRED_PROVIDER_bluez4 ?= "bluez4" 46PREFERRED_PROVIDER_bluez4 ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez4',d)}"
47PREFERRED_PROVIDER_bluez-hcidump ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez-hcidump',d)}" 47PREFERRED_PROVIDER_bluez-hcidump ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez-hcidump',d)}"
48# Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb 48# Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb
49PREFERRED_PROVIDER_ltp ?= "ltp" 49PREFERRED_PROVIDER_ltp ?= "ltp"