From 80c0eeab42a703ccf25ce06e6508119f0d82f129 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 16 Jul 2015 14:22:15 +0200 Subject: [PATCH] module-atheros: fix module not loading in kernel 2.6.35 This is a regression introduced in a74363c. The MOD_VARIANT variable was not correctly set because in kernel 2.6.35 there is no device-tree support. The fix is to get the module variant from the sysfs as a fallback for old kernels. https://jira.digi.com/browse/DEL-1694 Signed-off-by: Javier Viguera (cherry picked from commit 6357d71152c38c4713fc534b78b6c2993b201aa8) --- .../kernel-module-atheros/kernel-module-atheros/atheros-pre-up | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/atheros-pre-up b/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/atheros-pre-up index 6685d7dab..78e776de3 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/atheros-pre-up +++ b/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros/atheros-pre-up @@ -88,7 +88,8 @@ rm -f ${TMP_MACFILE} # MACHINE="$(cat /proc/device-tree/digi,machine,name 2>/dev/null || \ cat /sys/kernel/machine/name)" -MOD_VARIANT="$(cat /proc/device-tree/digi,hwid,variant 2>/dev/null)" +MOD_VARIANT="$(cat /proc/device-tree/digi,hwid,variant 2>/dev/null || \ + cat /sys/kernel/${MACHINE}/mod_variant)" REGION_CODE="$(cat /proc/device-tree/digi,hwid,cert 2>/dev/null || \ cat /sys/kernel/${MACHINE}/mod_cert)"