X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus;a=blobdiff_plain;f=meta-openvuplus%2Frecipes-connectivity%2Ftasks%2Ftask-vuplus-wlan.bb;h=00b16e5ee96be8ae9c28cdf0aa4bd9cd1ff5a16d;hp=f5f7c1a8cf09373fb901289aab2654ca23849a20;hb=b52ef2945d01857f61b611a57e36d4f7b2f8c315;hpb=0e6c5d97c12ae5eb100dc835a2ec6df30c9ebb95

diff --git a/meta-openvuplus/recipes-connectivity/tasks/task-vuplus-wlan.bb b/meta-openvuplus/recipes-connectivity/tasks/task-vuplus-wlan.bb
index f5f7c1a..00b16e5 100644
--- a/meta-openvuplus/recipes-connectivity/tasks/task-vuplus-wlan.bb
+++ b/meta-openvuplus/recipes-connectivity/tasks/task-vuplus-wlan.bb
@@ -2,13 +2,13 @@ DESCRIPTION = "Vuplus: W-LAN Task for the Vuplus Distribution"
 SECTION = "vuplus/base"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r8"
+PR = "r15"
 
 inherit task
 
 DEPENDS_${PN} = "enigma2-plugins"
 RDEPENDS_${PN} = "\
-	${@base_contains("MACHINE_FEATURES", "vuwlan", "enigma2-plugin-systemplugins-wirelesslansetup", "enigma2-plugin-systemplugins-wirelesslan", d)} \
+	${@base_contains("VUPLUS_FEATURES", "vuwlan", "enigma2-plugin-systemplugins-wirelesslansetup", "enigma2-plugin-systemplugins-wirelesslan", d)} \
 	wireless-tools \
 	wpa-supplicant \
 "
@@ -22,34 +22,36 @@ WIFI_FIRMWARES = "\
 	firmware-rt3070 \
 "
 
-RALINK_MODULE = "${@base_version_less_or_equal('VUPLUS_KERNEL_VERSION', '3.1.1', 'rt3070', 'kernel-module-rt2800usb rt2870sta firmware-rt3070', d)}"
-
-REALTEK_MODULE = "${@base_version_less_or_equal('VUPLUS_KERNEL_VERSION', '3.1.1', 'r8192cu', 'kernel-module-rtl8192cu', d)}"
-
 KERNEL_WIFI_MODULES = " \
 	kernel-module-ath9k-htc \
 	kernel-module-carl9170 \
 	kernel-module-prism2-usb \
 	kernel-module-rt73usb \
 	kernel-module-rt2500usb \
-	kernel-module-r8192u-usb \
-	kernel-module-rtl8192cu \
 	kernel-module-rtl8187 \
 	kernel-module-r8712u \
 	kernel-module-w35und \
 	kernel-module-zd1211rw \
-	kernel-module-rt2800usb \
 	kernel-module-llc \
 	kernel-module-stp \
 	kernel-module-bridge \
 	kernel-module-hostap \
+	${@base_contains('VUPLUS_FEATURES', 'ralink-kmod', 'kernel-module-rt2800usb', ' ', d)} \
+"
+
+KERNEL_WIFI_MODULES += "${@base_version_less_or_equal('VUPLUS_KERNEL_VERSION', '3.1.1', 'kernel-module-r8192u-usb', '', d)}"
+
+LEGACY_MODULES = " \
+	${@base_contains('VUPLUS_FEATURES', 'ralink-legacy', 'rt3070', ' ', d)} \
+	r8192cu \
 "
 
 RDEPENDS_${PN}_append = "\
 	${WIFI_FIRMWARES} \
 	${KERNEL_WIFI_MODULES} \
-	${RALINK_MODULE} \
-	${REALTEK_MODULE} \
+	${LEGACY_MODULES} \
+	rt2870sta \
 "
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"