[oe-commits] org.oe.dev rename linux_modules to linux-kernel-base, add common kernel_get*version functions to this class
mickeyl commit
openembedded-commits at lists.openembedded.org
Fri Oct 13 09:48:38 UTC 2006
rename linux_modules to linux-kernel-base, add common kernel_get*version functions to this class
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: a0629352152e47a18449beec57ef52289d116470
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a0629352152e47a18449beec57ef52289d116470
Files:
1
classes/linux_modules.bbclass
classes/linux-kernel-base.bbclass
classes/kernel.bbclass
Diffs:
#
# mt diff -rf152f765fbd9d8c3d4700c83f97d6fd98cc473a8 -ra0629352152e47a18449beec57ef52289d116470
#
#
#
# rename "classes/linux_modules.bbclass"
# to "classes/linux-kernel-base.bbclass"
#
# patch "classes/kernel.bbclass"
# from [bb10bf03ee771fdce64047ec2c5f9b470dd9c5ec]
# to [20373c3f84a2bcc68588675a39e8ccb054681b62]
#
# patch "classes/linux-kernel-base.bbclass"
# from [f287ad17cb9ae9a7b4d82b8ad28092cca67040ea]
# to [318da7ebdc85b8e7fadcd99d5f4ce482b885e797]
#
============================================================
--- classes/kernel.bbclass bb10bf03ee771fdce64047ec2c5f9b470dd9c5ec
+++ classes/kernel.bbclass 20373c3f84a2bcc68588675a39e8ccb054681b62
@@ -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 @@ export CMDLINE_CONSOLE = "console=${@bb.
#
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}')}"
============================================================
--- classes/linux_modules.bbclass f287ad17cb9ae9a7b4d82b8ad28092cca67040ea
+++ classes/linux-kernel-base.bbclass 318da7ebdc85b8e7fadcd99d5f4ce482b885e797
@@ -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]+).*")
More information about the Openembedded-commits
mailing list