aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2008-03-12 22:12:38 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2008-03-12 22:12:38 +0000
commita6443d5713c791e5de110cc68e6e2689d497de6e (patch)
tree2e24e5d6763600aac8fb177815d511e36bab2b11
parent33e0bcff6c0d5d4c71985acad2f5a695ff677d67 (diff)
downloadopenembedded-a6443d5713c791e5de110cc68e6e2689d497de6e.tar.gz
applied changes from 38f8ae6418f23fd2c13f29ecf5b41628ff3dedcd
through 43753505f023f7853afdd0f497c28ef65c4b2509 kernel: add wifi suspend fix for hostap|orinoco. Also, add base_version_less_or_equal(). (Bernhard, PaulS)
-rw-r--r--classes/base.bbclass8
-rw-r--r--classes/kernel.bbclass2
2 files changed, 10 insertions, 0 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index 2b508a8e84..844ef26da4 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -128,6 +128,14 @@ def base_less_or_equal(variable, checkvalue, truevalue, falsevalue, d):
else:
return falsevalue
+def base_version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d):
+ import bb
+ result = bb.vercmp(bb.data.getVar(variable,d,True), checkvalue)
+ if result <= 0:
+ return truevalue
+ else:
+ return falsevalue
+
def base_contains(variable, checkvalues, truevalue, falsevalue, d):
import bb
matches = 0
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index c00d0f3f58..0ee2946f52 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -193,6 +193,8 @@ FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
FILES_kernel-dev = "/boot/System.map* /boot/config*"
FILES_kernel-vmlinux = "/boot/vmlinux*"
RDEPENDS_kernel = "kernel-base"
+RRECOMMENDS_kernel-module-hostap-cs += '${@base_version_less_or_equal("KERNEL_VERSION", "2.6.17", "", "apm-wifi-suspendfix", d)}'
+RRECOMMENDS_kernel-module-orinoco-cs += '${@base_version_less_or_equal("KERNEL_VERSION", "2.6.17", "", "apm-wifi-suspendfix", d)}'
# Allow machines to override this dependency if kernel image files are
# not wanted in images as standard
RDEPENDS_kernel-base ?= "kernel-image"