[PATCH] arago.conf, packagegroups: switch from bluez4 to bluez5

[PATCH] arago.conf, packagegroups: switch from bluez4 to bluez5

[Denys Dmytriyenko]

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta-arago-distro/conf/distro/arago.conf                   |  1 -
 .../packagegroup-arago-tisdk-connectivity-sdk-target.bb    |  4 ++--
 .../packagegroups/packagegroup-arago-tisdk-connectivity.bb | 14 ++++++--------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
index 1adb9c9..d0aa532 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -57,7 +57,6 @@ DISTRO_FEATURES = "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC}"
 
 # Remove some unwanted features
 DISTRO_FEATURES_remove = "x11"
-DISTRO_FEATURES_BACKFILL_CONSIDERED = "bluez5"
 
 # Add additional distro features
 DISTRO_FEATURES_append = " pam wayland opengl systemd"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-target.bb
index 8b8a953..3380913 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-target.bb
@@ -1,13 +1,13 @@
 DESCRIPTION = "Task to install wireless headers and libraries into the SDK"
 LICENSE = "MIT"
-PR = "r8"
+PR = "r9"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit packagegroup
 
 BLUETOOTH_STACK = "\
-    bluez4-dev \
+    bluez5-dev \
 "
 
 CONNECTIVITY_RDEPENDS = ""
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
index 1bf84b7..f64998c 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task to install wireless packages into the target FS"
 LICENSE = "MIT"
-PR = "r35"
+PR = "r36"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -12,8 +12,6 @@ WLAN_COMMON = "\
     wireless-tools \
     iw \
     softap-udhcpd-config \
-    obexd \
-    obex-client \
     pulseaudio \
     pulseaudio-server \
     pulseaudio-module-loopback \
@@ -31,6 +29,7 @@ WLAN_COMMON = "\
 
 FIRMWARE_AND_DRIVERS = "\
     wl18xx-firmware \
+    bt-firmware \
 "
 
 DEMO_APPS = "\
@@ -38,9 +37,10 @@ DEMO_APPS = "\
 "
 
 BLUETOOTH_STACK = "\
-    bluez4 \
-    bluez4-agent \
-    bluez-hcidump \
+    bluez5 \
+    bluez5-obex \
+    bluez5-noinst-tools \
+    bluez5-testtools \
     uim \
 "
 
@@ -56,7 +56,6 @@ CONNECTIVITY_RDEPENDS_append_ti33x = "\
     ${DEMO_APPS} \
     ${BLUETOOTH_STACK} \
     ${FIRMWARE_AND_DRIVERS} \
-    bt-firmware \
 "
 
 CONNECTIVITY_RDEPENDS_append_ti43x = "\
@@ -70,7 +69,6 @@ CONNECTIVITY_RDEPENDS_append_dra7xx = "\
     ${WLAN_COMMON} \
     ${BLUETOOTH_STACK} \
     ${FIRMWARE_AND_DRIVERS} \
-    bt-firmware \
 "
 
 RDEPENDS_${PN} = "\
-- 
2.7.4