diff options
| author | Michael-Luke Jones <mlj28@cam.ac.uk> | 2006-09-23 15:44:37 +0000 |
|---|---|---|
| committer | Michael-Luke Jones <mlj28@cam.ac.uk> | 2006-09-23 15:44:37 +0000 |
| commit | 81871146fc44e7bfb8994d72179f1d2b18234f46 (patch) | |
| tree | 56554958dd9cab600b6df0962a2d0f6214b5498f /classes/kernel.bbclass | |
| parent | b0b86b00cd0958f9b320546de9171f127a7f17d6 (diff) | |
| parent | 7800aa9b73b83aa07a4a10a6fda5d38c7b7a0bbe (diff) | |
merge of '4ed867356aa513df5383618b7b7dbfe95e1a60f3'
and '61fe964a3f1677ae14fdaf18662f4d14b4613bb1'
Diffstat (limited to 'classes/kernel.bbclass')
| -rw-r--r-- | classes/kernel.bbclass | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index c81112ede7..f5938a798f 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -45,11 +45,18 @@ export CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "tt # parse kernel ABI version out of <linux/version.h> def get_kernelversion(p): + import re, os + + fn = p + '/include/linux/utsrelease.h' + if not os.path.isfile(fn): + fn = p + '/include/linux/version.h' + import re try: - f = open(p, 'r') + f = open(fn, 'r') except IOError: return None + l = f.readlines() f.close() r = re.compile("#define UTS_RELEASE \"(.*)\"") @@ -67,7 +74,7 @@ def get_kernelmajorversion(p): return m.group(1) return None -KERNEL_VERSION = "${@get_kernelversion('${S}/include/linux/version.h')}" +KERNEL_VERSION = "${@get_kernelversion('${S}')}" KERNEL_MAJOR_VERSION = "${@get_kernelmajorversion('${KERNEL_VERSION}')}" KERNEL_LOCALVERSION ?= "" |