diff options
| -rw-r--r-- | classes/kernel.bbclass | 33 | ||||
| -rw-r--r-- | classes/linux-kernel-base.bbclass (renamed from classes/linux_modules.bbclass) | 23 |
2 files changed, 24 insertions, 32 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 94e02925d7..3a7fd5b499 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -1,4 +1,4 @@ -inherit module_strip +inherit linux-kernel-base module_strip PROVIDES += "virtual/kernel" DEPENDS += "virtual/${TARGET_PREFIX}depmod-${@get_kernelmajorversion('${PV}')} virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules" @@ -43,37 +43,6 @@ KERNEL_IMAGEDEST = "boot" # export CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}" -# 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(fn, 'r') - except IOError: - return None - - l = f.readlines() - f.close() - r = re.compile("#define UTS_RELEASE \"(.*)\"") - for s in l: - m = r.match(s) - if m: - return m.group(1) - return None - -def get_kernelmajorversion(p): - import re - r = re.compile("([0-9]+\.[0-9]+).*") - m = r.match(p); - if m: - return m.group(1) - return None - KERNEL_VERSION = "${@get_kernelversion('${S}')}" KERNEL_MAJOR_VERSION = "${@get_kernelmajorversion('${KERNEL_VERSION}')}" diff --git a/classes/linux_modules.bbclass b/classes/linux-kernel-base.bbclass index d5c4e74ca1..e58c228080 100644 --- a/classes/linux_modules.bbclass +++ b/classes/linux-kernel-base.bbclass @@ -1,3 +1,26 @@ +# 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(fn, 'r') + except IOError: + return None + + l = f.readlines() + f.close() + r = re.compile("#define UTS_RELEASE \"(.*)\"") + for s in l: + m = r.match(s) + if m: + return m.group(1) + return None + def get_kernelmajorversion(p): import re r = re.compile("([0-9]+\.[0-9]+).*") |