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 <alex.gonzalez@digi.com>
This commit is contained in:
Alex Gonzalez 2013-07-10 13:01:01 +02:00
parent 2afd15d816
commit ee8e198c16
1 changed files with 4 additions and 5 deletions

View File

@ -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}"