From d8d5feee2ab48ea15112242a7f5bf79a1fcfb2e9 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 16 Feb 2015 17:06:21 +0200 Subject: 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 Signed-off-by: Richard Purdie --- meta/conf/distro/include/default-providers.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/conf/distro/include/default-providers.inc') 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" PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','udev',d)}" # There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details # on this rather strange entry. -PREFERRED_PROVIDER_bluez4 ?= "bluez4" +PREFERRED_PROVIDER_bluez4 ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez4',d)}" PREFERRED_PROVIDER_bluez-hcidump ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez-hcidump',d)}" # Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb PREFERRED_PROVIDER_ltp ?= "ltp" -- cgit v1.2.3-54-g00ecf