From: Joshua Lock <josh@linux.intel.com>
Date: Thu, 20 May 2010 13:14:22 +0000 (+0100)
Subject: linux-kernel-base.bbclass: merge version detection updates from upstream
X-Git-Tag: yocto-4.0~45678
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3da120a87247a2f8076e4e28e40615474a12bbc1;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

linux-kernel-base.bbclass: merge version detection updates from upstream

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>
---

diff --git a/meta/classes/linux-kernel-base.bbclass b/meta/classes/linux-kernel-base.bbclass
index b3e0fdad7a2..510951a620b 100644
--- a/meta/classes/linux-kernel-base.bbclass
+++ b/meta/classes/linux-kernel-base.bbclass
@@ -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'