diff options
| author | Koen Kooi <koen@openembedded.org> | 2010-04-15 11:50:40 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2010-04-15 11:50:40 +0200 |
| commit | 636141f6fafc4b5f8dde68036d367d77219fa25c (patch) | |
| tree | a75eadea56fc3525b76be3a79dcdd86637d989af /classes | |
| parent | aa9b5a722198e9bfc06a8f4fb67143702e500dfa (diff) | |
kernel bbclass: read version from ${B}, remove obsolete hostap logic that breaks the build (from poky)
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/kernel.bbclass | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 003bda04b7..7f7062b5a0 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -66,7 +66,7 @@ KERNEL_IMAGEDEST = "boot" # export CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}" -KERNEL_VERSION = "${@get_kernelversion('${S}')}" +KERNEL_VERSION = "${@get_kernelversion('${B}')}" KERNEL_MAJOR_VERSION = "${@get_kernelmajorversion('${KERNEL_VERSION}')}" KERNEL_LOCALVERSION ?= "" @@ -244,8 +244,6 @@ FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*" FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /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" |