kernel.bbclass: Sync with updates in OE to work with kernels >= 2.6.18
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@851 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
parent
5d6699af12
commit
0d59c10f98
|
@ -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"
|
||||
|
@ -10,7 +10,7 @@ PACKAGES_DYNAMIC += "kernel-image-*"
|
|||
|
||||
export OS = "${TARGET_OS}"
|
||||
export CROSS_COMPILE = "${TARGET_PREFIX}"
|
||||
KERNEL_IMAGETYPE = "zImage"
|
||||
KERNEL_IMAGETYPE ?= "zImage"
|
||||
|
||||
KERNEL_PRIORITY = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[-1]}"
|
||||
|
||||
|
@ -43,31 +43,7 @@ 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
|
||||
try:
|
||||
f = open(p, '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}/include/linux/version.h')}"
|
||||
KERNEL_VERSION = "${@get_kernelversion('${S}')}"
|
||||
KERNEL_MAJOR_VERSION = "${@get_kernelmajorversion('${KERNEL_VERSION}')}"
|
||||
|
||||
KERNEL_LOCALVERSION ?= ""
|
||||
|
|
|
@ -0,0 +1,42 @@
|
|||
# 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
|
||||
|
||||
def linux_module_packages(s, d):
|
||||
import bb, os.path
|
||||
suffix = ""
|
||||
if (bb.data.getVar("PARALLEL_INSTALL_MODULES", d, 1) == "1"):
|
||||
file = bb.data.expand('${STAGING_KERNEL_DIR}/kernel-abiversion', d)
|
||||
if (os.path.exists(file)):
|
||||
suffix = "-%s" % (get_kernelmajorversion(base_read_file(file)))
|
||||
return " ".join(map(lambda s: "kernel-module-%s%s" % (s.lower().replace('_', '-').replace('@', '+'), suffix), s.split()))
|
||||
|
||||
# that's all
|
||||
|
Loading…
Reference in New Issue