diff options
| -rw-r--r-- | meta/classes/kernel-yocto.bbclass | 24 | ||||
| -rw-r--r-- | meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto.inc | 6 |
3 files changed, 24 insertions, 8 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 python do_kernel_configcheck() { import re, string, sys - bb.plain("NOTE: validating kernel config, see log.do_kernel_configcheck for details") - # if KMETA isn't set globally by a recipe using this routine, we need to # set the default to 'meta'. Otherwise, kconf_check is not passed a valid # meta-series for processing @@ -266,11 +264,23 @@ python do_kernel_configcheck() { cmd = d.expand("cd ${S}; kconf_check -config- %s/meta-series ${S} ${B}" % kmeta) ret, result = oe.utils.getstatusoutput("%s%s" % (pathprefix, cmd)) - config_check_visibility = d.getVar( "KCONF_AUDIT_LEVEL", True ) or 1 - if config_check_visibility == 1: - bb.debug( 1, "%s" % result ) - else: - bb.note( "%s" % result ) + config_check_visibility = int(d.getVar( "KCONF_AUDIT_LEVEL", True ) or 0) + + # if config check visibility is non-zero, report dropped configuration values + mismatch_file = "${S}/" + kmeta + "/" + "mismatch.cfg" + if os.path.exists(mismatch_file): + if config_check_visibility: + with open (mismatch_file, "r") as myfile: + results = myfile.read() + bb.warn( "[kernel config]: specified values did not make it into the kernel's final configuration:\n\n%s" % results) + + # if config check visibility is level 2 or higher, report non-hardware options + nonhw_file = "${S}/" + kmeta + "/" + "nonhw_report.cfg" + if os.path.exists(nonhw_file): + if config_check_visibility > 1: + with open (nonhw_file, "r") as myfile: + results = myfile.read() + bb.warn( "[kernel config]: BSP specified non-hw configuration:\n\n%s" % results) } # Ensure that the branches (BSP and meta) are on the locations specified by 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 3278398648..80d26f9874 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=d8d1d729a70c DEPENDS = "git-native" -SRCREV = "daab4442c22c09a98a823c32d7219316b6832182" +SRCREV = "cab17f884998b43692244a863dea6f505c7f67af" PR = "r12" PV = "0.2+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index 7416af99f5..79b3f256f4 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc @@ -23,6 +23,12 @@ KBRANCH ?= "master" KMACHINE ?= "${MACHINE}" SRCREV_FORMAT ?= "meta_machine" +# LEVELS: +# 0: no reporting +# 1: report options that are specified, but not in the final config +# 2: report options that are not hardware related, but set by a BSP +KCONF_AUDIT_LEVEL ?= "1" + LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}" do_patch[depends] = "kern-tools-native:do_populate_sysroot" |