From e5c43dc7f1e17f360b5dc762045ccf7895d18843 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 14 Apr 2016 14:33:51 +0100 Subject: default-providers: Update to use PREFERRED_RPROVIDER Get rid of the very confusing PREFERRED_PROVIDER_bluez4 using the new/better PREFERRED_RPROVIDER syntax. [YOCTO #5044] Signed-off-by: Richard Purdie --- meta/conf/distro/include/default-providers.inc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'meta/conf') diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index 5801b67f35..b2548e1b4c 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -46,10 +46,8 @@ PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg" PREFERRED_PROVIDER_console-tools ?= "kbd" PREFERRED_PROVIDER_gzip-native ?= "pigz-native" PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}" -# There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details -# on this rather strange entry. -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)}" +PREFERRED_RPROVIDER_libasound-module-bluez ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez4',d)}" +PREFERRED_RPROVIDER_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" PREFERRED_PROVIDER_getopt ?= "util-linux-getopt" -- cgit 1.2.3-korg