changed rt3070 driver in solo2. (kernel -> legacy)

[vuplus_openvuplus_3.0] / meta-openvuplus / recipes-connectivity / tasks / task-vuplus-wlan.bb

diff --git a/meta-openvuplus/recipes-connectivity/tasks/task-vuplus-wlan.bb b/meta-openvuplus/recipes-connectivity/tasks/task-vuplus-wlan.bb
index 7fc1160..efb014b 100644 (file)
--- 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 = "r9"
+PR = "r14"
 
 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,7 +22,7 @@ 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)}"
+RALINK_MODULE = "${@base_contains('VUPLUS_FEATURES', 'ralink-kmod', 'kernel-module-rt2800usb rt2870sta firmware-rt3070', 'rt3070', d)}"
 
 REALTEK_MODULE = "r8192cu"
 
@@ -32,18 +32,18 @@ KERNEL_WIFI_MODULES = " \
        kernel-module-prism2-usb \
        kernel-module-rt73usb \
        kernel-module-rt2500usb \
-       kernel-module-r8192u-usb \
        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 \
 "
 
+KERNEL_WIFI_MODULES += "${@base_version_less_or_equal('VUPLUS_KERNEL_VERSION', '3.1.1', 'kernel-module-r8192u-usb', '', d)}"
+
 RDEPENDS_${PN}_append = "\
        ${WIFI_FIRMWARES} \
        ${KERNEL_WIFI_MODULES} \