summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2011-09-02 23:03:24 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-05 20:25:46 +0100
commit593b2e277bd23980a5612613c3538e14dfc9cc47 (patch)
treeaf8f7e009211e087c6c33f66eaff403b35fef267 /meta
parent654112e76c23fab2ee7105fc5927ac98b5aa9daa (diff)
downloadpoky-593b2e277bd23980a5612613c3538e14dfc9cc47.tar.gz
linux-yocto: generalize kernel config search pattern
After constructing a kernel configuration file it then needs to be located in the tree so it can be audited against the final .config. The previous string that was used for the search pattern contains the kernel version. If the recipe space kernel version and internal tree version are out of sync, this will cause the constructed config to not be found. By removing the version from the search string, we can still find out config and gracefully adapt to minor version skew. (From OE-Core rev: f072ddc43828ebe8df4dd7433726775dd547580b) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/kernel-yocto.bbclass2
-rw-r--r--meta/recipes-kernel/kern-tools/kern-tools-native_git.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index daaee500e3..0f92267570 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -105,7 +105,7 @@ python do_kernel_configcheck() {
105 bb.plain("NOTE: validating kernel configuration") 105 bb.plain("NOTE: validating kernel configuration")
106 106
107 pathprefix = "export PATH=%s; " % bb.data.getVar('PATH', d, True) 107 pathprefix = "export PATH=%s; " % bb.data.getVar('PATH', d, True)
108 cmd = bb.data.expand("cd ${B}/..; kconf_check -${LINUX_KERNEL_TYPE}-config-${LINUX_VERSION} ${B} ${S} ${B} ${KBRANCH}",d ) 108 cmd = bb.data.expand("cd ${B}/..; kconf_check -${LINUX_KERNEL_TYPE}-config- ${B} ${S} ${B} ${KBRANCH}",d )
109 ret, result = commands.getstatusoutput("%s%s" % (pathprefix, cmd)) 109 ret, result = commands.getstatusoutput("%s%s" % (pathprefix, cmd))
110 110
111 bb.plain( "%s" % result ) 111 bb.plain( "%s" % result )
diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index 1649bbc414..edaaea6d27 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=e2bf4415f3d8
4 4
5DEPENDS = "git-native guilt-native" 5DEPENDS = "git-native guilt-native"
6 6
7SRCREV = "eab0c4eeb9fdb3d83e7aca4b70334cc7b02540b6" 7SRCREV = "60723c84395a9ac1753589824e30be39a781bb82"
8PR = r10 8PR = r10
9PV = "0.1+git${SRCPV}" 9PV = "0.1+git${SRCPV}"
10 10