summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Larson <clarson@mvista.com>2009-02-26 14:31:29 -0800
committerChris Larson <clarson@kergoth.com>2009-03-21 20:06:34 -0700
commit06e6fddcf04474cd1006ee8ad3e51c2c2dbfde2a (patch)
tree9d6bf27553956db0562f0340fa31069d43f55d49
parent114155243344c15847e73598e82d02926443cbf1 (diff)
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>
-rw-r--r--classes/base.bbclass4
-rw-r--r--conf/bitbake.conf6
2 files changed, 8 insertions, 2 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index caaa6b2da1..11f6554d2d 100644
--- 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 7954b8deec..7a6f80f1e8 100644
--- 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
###