[oe-commits] org.oe.dev kernel.bbclass: Update get_kernelversion for changes in kernels >= 2.6.18

[rpurdie commit]

kernel.bbclass: Update get_kernelversion for changes in kernels >= 2.6.18

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 6f348542e34f8265ef7567248e64177dbfdfe8aa
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6f348542e34f8265ef7567248e64177dbfdfe8aa
Files:
1
classes/kernel.bbclass
Diffs:

#
# mt diff -re1ceeb763614eca16eb25024c1a0e9025089ef02 -r6f348542e34f8265ef7567248e64177dbfdfe8aa
#
# 
# 
# patch "classes/kernel.bbclass"
#  from [d434fe767423a1fb2e28a06703486aab69e75623]
#    to [5f684019e29cac25d1f3956c9350f2f8ef5b9d34]
# 
============================================================
--- classes/kernel.bbclass	d434fe767423a1fb2e28a06703486aab69e75623
+++ classes/kernel.bbclass	5f684019e29cac25d1f3956c9350f2f8ef5b9d34
@@ -45,11 +45,18 @@ def get_kernelversion(p):
 
 # 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 ?= ""