X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=blobdiff_plain;f=meta-openvuplus%2Frecipes-connectivity%2Fpackagegroups%2Fpackagegroup-vuplus-wlan.bb;h=f79f89ca3d0631971cd4c832303d29c7dab4c4ff;hp=dba0e471a7397b0384f7ef63d2cf8c36f272f6c6;hb=b3c10d75cdbdecf044df85d2dda62ff4c409a4d3;hpb=244dee7641cea48ad29344e44829ac94e0425005;ds=sidebyside

diff --git a/meta-openvuplus/recipes-connectivity/packagegroups/packagegroup-vuplus-wlan.bb b/meta-openvuplus/recipes-connectivity/packagegroups/packagegroup-vuplus-wlan.bb
index dba0e47..f79f89c 100644
--- a/meta-openvuplus/recipes-connectivity/packagegroups/packagegroup-vuplus-wlan.bb
+++ b/meta-openvuplus/recipes-connectivity/packagegroups/packagegroup-vuplus-wlan.bb
@@ -2,7 +2,9 @@ DESCRIPTION = "Vuplus: W-LAN package group for the Vuplus Distribution"
 SECTION = "vuplus/base"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r15"
+PR = "r22"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit packagegroup
 
@@ -30,20 +32,20 @@ KERNEL_WIFI_MODULES = " \
 	kernel-module-rt2500usb \
 	kernel-module-rtl8187 \
 	kernel-module-r8712u \
-	kernel-module-w35und \
 	kernel-module-zd1211rw \
 	kernel-module-llc \
 	kernel-module-stp \
 	kernel-module-bridge \
 	kernel-module-hostap \
-	${@base_contains('VUPLUS_FEATURES', 'ralink-kmod', 'kernel-module-rt2800usb', ' ', d)} \
+	kernel-module-rt2800usb \
 "
 
 KERNEL_WIFI_MODULES += "${@base_version_less_or_equal('VUPLUS_KERNEL_VERSION', '3.1.1', 'kernel-module-r8192u-usb', '', d)}"
+KERNEL_WIFI_MODULES += "${@base_version_less_or_equal('VUPLUS_KERNEL_VERSION', '3.14.28', 'kernel-module-w35und', '', d)}"
 
 LEGACY_MODULES = " \
-	${@base_contains('VUPLUS_FEATURES', 'ralink-legacy', 'rt3070', ' ', d)} \
 	r8192cu \
+	rt3070 \
 "
 
 RDEPENDS_${PN}_append = "\
@@ -51,7 +53,7 @@ RDEPENDS_${PN}_append = "\
 	${KERNEL_WIFI_MODULES} \
 	${LEGACY_MODULES} \
 	rt2870sta \
+	${@base_conditional("MACHINE", "vuultimo4k", "vuplus-wifi-util-vuultimo4k", "", d)} \
+	${@base_conditional("MACHINE", "vuduo4k", "vuplus-wifi-util-vuduo4k", "", d)} \
 "
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-