[oe-commits] Bruce Ashfield : linux-yocto: generalize kernel config search pattern
git version control
git at git.openembedded.org
Mon Sep 5 19:28:54 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: f072ddc43828ebe8df4dd7433726775dd547580b
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=f072ddc43828ebe8df4dd7433726775dd547580b
Author: Bruce Ashfield <bruce.ashfield at windriver.com>
Date: Fri Sep 2 23:03:24 2011 -0400
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.
Signed-off-by: Bruce Ashfield <bruce.ashfield at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/kernel-yocto.bbclass | 2 +-
.../kern-tools/kern-tools-native_git.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index daaee50..0f92267 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -105,7 +105,7 @@ python do_kernel_configcheck() {
bb.plain("NOTE: validating kernel configuration")
pathprefix = "export PATH=%s; " % bb.data.getVar('PATH', d, True)
- cmd = bb.data.expand("cd ${B}/..; kconf_check -${LINUX_KERNEL_TYPE}-config-${LINUX_VERSION} ${B} ${S} ${B} ${KBRANCH}",d )
+ cmd = bb.data.expand("cd ${B}/..; kconf_check -${LINUX_KERNEL_TYPE}-config- ${B} ${S} ${B} ${KBRANCH}",d )
ret, result = commands.getstatusoutput("%s%s" % (pathprefix, cmd))
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 1649bbc..edaaea6 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
DEPENDS = "git-native guilt-native"
-SRCREV = "eab0c4eeb9fdb3d83e7aca4b70334cc7b02540b6"
+SRCREV = "60723c84395a9ac1753589824e30be39a781bb82"
PR = r10
PV = "0.1+git${SRCPV}"
More information about the Openembedded-commits
mailing list