]> code.ossystems Code Review - openembedded-core.git/commitdiff
linux-kernel-base.bbclass: merge version detection updates from upstream
authorJoshua Lock <josh@linux.intel.com>
Thu, 20 May 2010 13:14:22 +0000 (14:14 +0100)
committerJoshua Lock <josh@linux.intel.com>
Thu, 20 May 2010 13:14:22 +0000 (14:14 +0100)
Kernels after 2.6.33 store the utrelease.h file, used to detect the kernels
version, in a different location.

Merged from oe.dev

Signed-off-by: Joshua Lock <josh@linux.intel.com>
meta/classes/linux-kernel-base.bbclass

index b3e0fdad7a27cc022766e8d052ad041f7a214991..510951a620b8b669c09154a8d4a7b87dc3656f69 100644 (file)
@@ -3,6 +3,9 @@ def get_kernelversion(p):
     import re
 
     fn = p + '/include/linux/utsrelease.h'
+    if not os.path.isfile(fn):
+        # after 2.6.33-rc1
+        fn = p + '/include/generated/utsrelease.h'
     if not os.path.isfile(fn):
         fn = p + '/include/linux/version.h'