summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-05-20 14:14:22 +0100
committerJoshua Lock <josh@linux.intel.com>2010-05-20 14:14:22 +0100
commit3da120a87247a2f8076e4e28e40615474a12bbc1 (patch)
tree4831d9de41c320663d7427a71709868541546d31 /meta/classes
parente30c5a29d27f424bb2ec8033bb8337d6ce54251c (diff)
downloadpoky-3da120a87247a2f8076e4e28e40615474a12bbc1.tar.gz
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>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/linux-kernel-base.bbclass3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes/linux-kernel-base.bbclass b/meta/classes/linux-kernel-base.bbclass
index b3e0fdad7a..510951a620 100644
--- a/meta/classes/linux-kernel-base.bbclass
+++ b/meta/classes/linux-kernel-base.bbclass
@@ -4,6 +4,9 @@ def get_kernelversion(p):
4 4
5 fn = p + '/include/linux/utsrelease.h' 5 fn = p + '/include/linux/utsrelease.h'
6 if not os.path.isfile(fn): 6 if not os.path.isfile(fn):
7 # after 2.6.33-rc1
8 fn = p + '/include/generated/utsrelease.h'
9 if not os.path.isfile(fn):
7 fn = p + '/include/linux/version.h' 10 fn = p + '/include/linux/version.h'
8 11
9 import re 12 import re