diff options
Diffstat (limited to 'meta/classes/kernel-yocto.bbclass')
-rw-r--r-- | meta/classes/kernel-yocto.bbclass | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 223825e546..0cbbb5f2d2 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass | |||
@@ -253,8 +253,6 @@ addtask kernel_configme after do_patch | |||
253 | python do_kernel_configcheck() { | 253 | python do_kernel_configcheck() { |
254 | import re, string, sys | 254 | import re, string, sys |
255 | 255 | ||
256 | bb.plain("NOTE: validating kernel config, see log.do_kernel_configcheck for details") | ||
257 | |||
258 | # if KMETA isn't set globally by a recipe using this routine, we need to | 256 | # if KMETA isn't set globally by a recipe using this routine, we need to |
259 | # set the default to 'meta'. Otherwise, kconf_check is not passed a valid | 257 | # set the default to 'meta'. Otherwise, kconf_check is not passed a valid |
260 | # meta-series for processing | 258 | # meta-series for processing |
@@ -266,11 +264,23 @@ python do_kernel_configcheck() { | |||
266 | cmd = d.expand("cd ${S}; kconf_check -config- %s/meta-series ${S} ${B}" % kmeta) | 264 | cmd = d.expand("cd ${S}; kconf_check -config- %s/meta-series ${S} ${B}" % kmeta) |
267 | ret, result = oe.utils.getstatusoutput("%s%s" % (pathprefix, cmd)) | 265 | ret, result = oe.utils.getstatusoutput("%s%s" % (pathprefix, cmd)) |
268 | 266 | ||
269 | config_check_visibility = d.getVar( "KCONF_AUDIT_LEVEL", True ) or 1 | 267 | config_check_visibility = int(d.getVar( "KCONF_AUDIT_LEVEL", True ) or 0) |
270 | if config_check_visibility == 1: | 268 | |
271 | bb.debug( 1, "%s" % result ) | 269 | # if config check visibility is non-zero, report dropped configuration values |
272 | else: | 270 | mismatch_file = "${S}/" + kmeta + "/" + "mismatch.cfg" |
273 | bb.note( "%s" % result ) | 271 | if os.path.exists(mismatch_file): |
272 | if config_check_visibility: | ||
273 | with open (mismatch_file, "r") as myfile: | ||
274 | results = myfile.read() | ||
275 | bb.warn( "[kernel config]: specified values did not make it into the kernel's final configuration:\n\n%s" % results) | ||
276 | |||
277 | # if config check visibility is level 2 or higher, report non-hardware options | ||
278 | nonhw_file = "${S}/" + kmeta + "/" + "nonhw_report.cfg" | ||
279 | if os.path.exists(nonhw_file): | ||
280 | if config_check_visibility > 1: | ||
281 | with open (nonhw_file, "r") as myfile: | ||
282 | results = myfile.read() | ||
283 | bb.warn( "[kernel config]: BSP specified non-hw configuration:\n\n%s" % results) | ||
274 | } | 284 | } |
275 | 285 | ||
276 | # Ensure that the branches (BSP and meta) are on the locations specified by | 286 | # Ensure that the branches (BSP and meta) are on the locations specified by |