Signed-off-by: Denys Dmytriyenko <[email protected]>
---
 .../packagegroup-arago-tisdk-connectivity.bb       | 58 ++++++++++++----------
 1 file changed, 32 insertions(+), 26 deletions(-)

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 b64f252..25d2e2a 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,13 +1,11 @@
 DESCRIPTION = "Task to install wireless packages into the target FS"
 LICENSE = "MIT"
-PR = "r40"
+PR = "r41"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit packagegroup
 
-# Disabled in master:
-#    crda
 # WLAN support packages.
 # These are the packages that all platforms use for WLAN support
 WLAN_COMMON = "\
@@ -16,34 +14,24 @@ WLAN_COMMON = "\
     softap-udhcpd-config \
     eventdump \
     wlconf \
-    wpa-supplicant-wl18xx \
-    hostap-daemon-wl18xx \
-    wl18xx-calibrator \
-    wl18xx-target-scripts \
-"
-
-# netperf has non-standard license, needs verifying
-#    netperf
-
-FIRMWARE_AND_DRIVERS = "\
-    wl18xx-fw \
-    bt-fw \
     linux-firmware-iwlwifi-8000c \
     linux-firmware-iwlwifi-8265 \
     linux-firmware-iwlwifi-3160-17 \
 "
 
-DEMO_APPS = "\
-    ${@base_conditional('QT_PROVIDER', 'qt5', '', 'wpa-gui-e', d)} \
+WLAN_TI = "\
+    wpa-supplicant-wl18xx \
+    hostap-daemon-wl18xx \
+    wl18xx-calibrator \
+    wl18xx-target-scripts \
+    wl18xx-fw \
 "
 
-BLUETOOTH_STACK = "\
+BT_COMMON = "\
     bluez5 \
     bluez5-obex \
     bluez5-noinst-tools \
     bluez5-testtools \
-    uim \
-    bt-enable \
     pulseaudio \
     pulseaudio-server \
     pulseaudio-module-loopback \
@@ -55,6 +43,16 @@ BLUETOOTH_STACK = "\
     sbc \
 "
 
+BT_TI = "\
+    uim \
+    bt-enable \
+    bt-fw \
+"
+
+DEMO_APPS = "\
+    ${@base_conditional('QT_PROVIDER', 'qt5', '', 'wpa-gui-e', d)} \
+"
+
 CONNECTIVITY_RDEPENDS = " \
     htop \
     iptables \
@@ -65,22 +63,30 @@ CONNECTIVITY_RDEPENDS = " \
 
 CONNECTIVITY_RDEPENDS_append_ti33x = "\
     ${WLAN_COMMON} \
+    ${WLAN_TI} \
+    ${BT_COMMON} \
+    ${BT_TI} \
     ${DEMO_APPS} \
-    ${BLUETOOTH_STACK} \
-    ${FIRMWARE_AND_DRIVERS} \
 "
 
 CONNECTIVITY_RDEPENDS_append_ti43x = "\
     ${WLAN_COMMON} \
+    ${WLAN_TI} \
+    ${BT_COMMON} \
+    ${BT_TI} \
     ${DEMO_APPS} \
-    ${BLUETOOTH_STACK} \
-    ${FIRMWARE_AND_DRIVERS} \
 "
 
 CONNECTIVITY_RDEPENDS_append_dra7xx = "\
     ${WLAN_COMMON} \
-    ${BLUETOOTH_STACK} \
-    ${FIRMWARE_AND_DRIVERS} \
+    ${WLAN_TI} \
+    ${BT_COMMON} \
+    ${BT_TI} \
+"
+
+CONNECTIVITY_RDEPENDS_append_k3 = "\
+    ${WLAN_COMMON} \
+    ${BT_COMMON} \
 "
 
 RDEPENDS_${PN} = "\
-- 
2.7.4

_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Reply via email to