clean up wlan.bb

[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 a71edef..d9b575b 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 = "r3"
+PR = "r6"
 
 inherit task
 
@@ -11,16 +11,12 @@ inherit task
 DESCRIPTION_${PN} = "Vuplus: W-LAN Support"
 DEPENDS_${PN} = "enigma2-plugins"
 RDEPENDS_${PN} = "\
-  enigma2-plugin-systemplugins-wirelesslan \
+  ${@base_contains("MACHINE_FEATURES", "vuwlan", "enigma2-plugin-systemplugins-wirelesslansetup", "enigma2-plugin-systemplugins-wirelesslan", d)} \
   wireless-tools \
   wpa-supplicant \
 "
 
 WLAN_CRYPTO_MODULES = "\
-  kernel-module-aes-generic \
-  kernel-module-arc4 \
-  kernel-module-cryptomgr \
-  kernel-module-ecb \
 "
 
 WLAN_PCI_MODULES = "\
@@ -32,11 +28,32 @@ WLAN_USB_MODULES = "\
   kernel-module-zd1211rw \
   rt73-firmware \
   zd1211-firmware \
+  r8192cu \
+  rt2870sta \
 "
 
-WLAN_USB_MODULES_2_6_18 = "\
+WLAN_USB_MODULES_LEGACY = "\
   zd1211b \
   wlan-rt73 \
+  r8712u \
+  rt3070 \
+  r8192cu \
+"
+
+RDEPENDS_${PN}_append_bm750 = "\
+  ${@base_contains('PREFERRED_VERSION_linux-bm750', '2.6.18', '${WLAN_USB_MODULES_LEGACY}', '${WLAN_CRYPTO_MODULES} ${WLAN_USB_MODULES}', d)} \
+"
+
+RDEPENDS_${PN}_append_vusolo = "\
+  ${@base_contains('PREFERRED_VERSION_linux-vusolo', '2.6.18', '${WLAN_USB_MODULES_LEGACY}', '${WLAN_CRYPTO_MODULES} ${WLAN_USB_MODULES}', d)} \
+"
+
+RDEPENDS_${PN}_append_vuuno = "\
+  ${@base_contains('PREFERRED_VERSION_linux-vuuno', '2.6.18', '${WLAN_USB_MODULES_LEGACY}', '${WLAN_CRYPTO_MODULES} ${WLAN_USB_MODULES}', d)} \
+"
+
+RDEPENDS_${PN}_append_vuultimo = "\
+  ${@base_contains('PREFERRED_VERSION_linux-vuultimo', '2.6.18', '${WLAN_USB_MODULES_LEGACY}', '${WLAN_CRYPTO_MODULES} ${WLAN_USB_MODULES}', d)} \
 "
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"