[OE-core] [PATCH 5/5] bluetooth.bbclass: set bluez5 as the default BT stack

[Cristian Iorga]

For a distro that contains bluetooth feature, set bluez5
as the default Bluetooth stack, while still allowing the
use of bluez4 as an alternative Bluetooth stack.

Signed-off-by: Cristian Iorga <cristian.iorga at intel.com>
---
 meta/classes/bluetooth.bbclass | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/meta/classes/bluetooth.bbclass b/meta/classes/bluetooth.bbclass
index f88b4ae..3816e7d 100644
--- a/meta/classes/bluetooth.bbclass
+++ b/meta/classes/bluetooth.bbclass
@@ -1,14 +1,20 @@
 # Avoid code duplication in bluetooth-dependent recipes.
 
-# Define a variable that expands to the recipe (package) providing core
-# bluetooth support on the platform:
+# Define a variable that expands to the recipe (package) providing
+# core bluetooth support on the platform:
 # "" if bluetooth is not in DISTRO_FEATURES
-# else "bluez5" if bluez5 is in DISTRO_FEATURES
-# else "bluez4"
+# else "bluez4" if bluez4 is in DISTRO_FEATURES
+# else "bluez5"
 
 # Use this with:
 #  inherit bluetooth
 #  PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}
 #  PACKAGECONFIG[bluez4] = "--enable-bluez4,--disable-bluez4,bluez4"
+# if the obsolete, but still supported bluez4 BT stack is used
+# or
+#  inherit bluetooth
+#  PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}
+#  PACKAGECONFIG[bluez5] = "--enable-bluez5,--disable-bluez5,bluez5"
+# if the default bluez5 BT stack is used
 
-BLUEZ ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5', 'bluez4', d), '', d)}"
+BLUEZ ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', bb.utils.contains('DISTRO_FEATURES', 'bluez4', 'bluez4', 'bluez5', d), '', d)}"
-- 
2.1.0