From ee8e198c16b044379eb925a855a2f732dcbe2259 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Wed, 10 Jul 2013 13:01:01 +0200 Subject: [PATCH] meta-digi-dey: Only include external atheros module for 2.6.35 kernel. The 3.10 kernel uses the upstream atheros driver. Also, rationalize the RDEPENDS in the recipe to use the wireless module variable instead of hardcoding values. Signed-off-by: Alex Gonzalez --- .../packagegroups/packagegroup-dey-wireless.bb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb index 238ab88ad..b8db17e1c 100644 --- a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb +++ b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb @@ -18,7 +18,8 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" WIRELESS_MODULE ?= "" WIRELESS_MODULE_append_mx5 = "${@base_contains('MACHINE_FEATURES', 'wifi', 'kernel-module-redpine', '', d)}" -WIRELESS_MODULE_append_mxs = "${@base_contains('MACHINE_FEATURES', 'wifi', 'kernel-module-atheros', '', d)}" +ATHEROS_WIRELESS_MODULE = '${@base_version_less_or_equal("PREFERRED_VERSION_linux-dey", "2.6.35.14", "kernel-module-atheros", "", d)}' +WIRELESS_MODULE_append_mxs = "${@base_contains('MACHINE_FEATURES', 'wifi', '${ATHEROS_WIRELESS_MODULE}', '', d)}" RDEPENDS_${PN} = "\ wpa-supplicant \ @@ -27,10 +28,8 @@ RDEPENDS_${PN} = "\ ${WIRELESS_MODULE} \ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" -RDEPENDS_${PN}_append_ccimx51js = "kernel-module-redpine" -RDEPENDS_${PN}_append_ccimx53js = "kernel-module-redpine" -RDEPENDS_${PN}_append_ccardimx28js = " iw kernel-module-atheros" -RDEPENDS_${PN}_append_cpx2 = " iw kernel-module-atheros" +RDEPENDS_${PN}_append_mx5 = "${WIRELESS_MODULE}" +RDEPENDS_${PN}_append_mxs = " iw ${WIRELESS_MODULE}" RRECOMMENDS_${PN} = "\ ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"