From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mail.openembedded.org (Postfix) with ESMTP id E04D571634 for ; Mon, 16 Feb 2015 15:07:17 +0000 (UTC) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP; 16 Feb 2015 06:59:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.09,588,1418112000"; d="scan'208";a="528207592" Received: from sentry.rb.intel.com ([10.237.105.37]) by orsmga003.jf.intel.com with ESMTP; 16 Feb 2015 06:58:09 -0800 From: Cristian Iorga To: openembedded-core@lists.openembedded.org Date: Mon, 16 Feb 2015 17:06:21 +0200 Message-Id: <19866bc3b773c78dfddcd6868e1451f99ac99d85.1424098977.git.cristian.iorga@intel.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: References: In-Reply-To: References: Subject: [PATCH 11/11] default-providers: Set the preferred provider for bluez based on version X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Feb 2015 15:07:18 -0000 From: Richard Purdie 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. Signed-off-by: Cristian Iorga --- meta/conf/distro/include/default-providers.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index 25118fa..8d92c2e 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" -- 2.1.0