From 92e0d61f5bf15ca4eb262dfa3c533f9209a87915 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 16 Sep 2011 18:38:01 +0000 Subject: linux-yocto: simplify kernel configuration check expression kernel configuration validation takes place between two files. An unprocessed configuration file (which is all the options found in the various configuration fragments) and the final .config produced by the lkc. The unprocessed configuration file's name historically is based on the name of the branch that was used to build the BSP. But with the ability to map machine names to arbitrary branches, this is no longer always true. Searching for the pattern *-config-* in the meta subdirectory will only match the config file, and frees the config validation phase from being concerned with what branch was used to build the BSP. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 0f9226757..2205686dd 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- ${B} ${S} ${B} ${KBRANCH}",d ) + cmd = bb.data.expand("cd ${B}/..; kconf_check -config- ${B} ${S} ${B} ${KBRANCH}",d ) ret, result = commands.getstatusoutput("%s%s" % (pathprefix, cmd)) bb.plain( "%s" % result ) -- cgit v1.2.3