Merge branch 'kernel31' of code.vuplus.com:/opt/repository/openembedded into kernel31

[vuplus_openembedded] / recipes / tasks / task-vuplus-wlan.bb

diff --git a/recipes/tasks/task-vuplus-wlan.bb b/recipes/tasks/task-vuplus-wlan.bb
index cbd9aa6..f9e47ef 100644 (file)
--- a/recipes/tasks/task-vuplus-wlan.bb
+++ b/recipes/tasks/task-vuplus-wlan.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Vuplus: W-LAN Task for the Vuplus Distribution"
 SECTION = "vuplus/base"
 LICENSE = "MIT"
-PR = "r6"
+PR = "r8"
 
 inherit task
 
@@ -29,6 +29,10 @@ WLAN_USB_MODULES = "\
   rt73-firmware \
   zd1211-firmware \
   r8192cu \
+  firmware-htc9271 \
+  firmware-rt2561 \
+  firmware-rtl8721u \
+  ${@base_contains("MACHINE_FEATURES", "rt3070-legacy", "rt3070", "rt2870sta firmware-rt3070 ", d)} \
 "
 
 WLAN_USB_MODULES_LEGACY = "\
@@ -55,18 +59,5 @@ RDEPENDS_${PN}_append_vuultimo = "\
   ${@base_contains('PREFERRED_VERSION_linux-vuultimo', '2.6.18', '${WLAN_USB_MODULES_LEGACY}', '${WLAN_CRYPTO_MODULES} ${WLAN_USB_MODULES}', d)} \
 "
 
-RDEPENDS_${PN}_append_bm750 = "\
-  ${@base_contains('PREFERRED_VERSION_linux-bm750', '3.1.1', 'rt2870sta', '', d)} \
-"
-RDEPENDS_${PN}_append_vusolo = "\
-  ${@base_contains('PREFERRED_VERSION_linux-vusolo', '3.1.1', 'rt2870sta', '', d)} \
-"
-RDEPENDS_${PN}_append_vuuno = "\
-  ${@base_contains('PREFERRED_VERSION_linux-vuuno', '3.1.1', 'rt2870sta', '', d)} \
-"
-RDEPENDS_${PN}_append_vuultimo = "\
-  ${@base_contains('PREFERRED_VERSION_linux-vuultimo', '3.1.1', 'rt2870sta', '', d)} \
-"
-
 PACKAGE_ARCH = "${MACHINE_ARCH}"