bitbake.conf: Move the list of vars shown in the pre-build config display to here.

Now a distro or machine can add their own variables to display.

Signed-off-by: Chris Larson <clarson@mvista.com>

diff --git a/classes/base.bbclass b/classes/base.bbclass
index caaa6b2..11f6554 100644 (file)
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -875,12 +875,12 @@ python base_eventhandler() {
 
        if name.startswith("BuildStarted"):
                bb.data.setVar( 'BB_VERSION', bb.__version__, e.data )
-               statusvars = ['BB_VERSION', 'METADATA_BRANCH', 'METADATA_REVISION', 'TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO', 'DISTRO_VERSION','TARGET_FPU']
+               statusvars = bb.data.getVar("BUILDCFG_VARS", e.data, 1).split()
                statuslines = ["%-17s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars]
                statusmsg = "\nOE Build Configuration:\n%s\n" % '\n'.join(statuslines)
                print statusmsg
 
-               needed_vars = [ "TARGET_ARCH", "TARGET_OS" ]
+               needed_vars = bb.data.getVar("BUILDCFG_NEEDEDVARS", e.data, 1).split()
                pesteruser = []
                for v in needed_vars:
                        val = bb.data.getVar(v, e.data, 1)

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 7954b8d..7a6f80f 100644 (file)
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -594,6 +594,12 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
 # Globally toggle certain dependencies
 ENTERPRISE_DISTRO ?= "0"
 
+# Pre-build configuration output
+BUILDCFG_VARS ?= "BB_VERSION METADATA_BRANCH METADATA_REVISION TARGET_ARCH TARGET_OS MACHINE DISTRO DISTRO_VERSION"
+BUILDCFG_VARS_append_arm = " TARGET_FPU"
+BUILDCFG_VARS_append_armeb = " TARGET_FPU"
+BUILDCFG_NEEDEDVARS ?= "TARGET_ARCH TARGET_OS"
+
 ###
 ### Config file processing
 ###