aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2013-06-06 02:06:11 -0500
committerRobert Yang <liezhi.yang@windriver.com>2018-07-13 10:31:52 +0800
commit8c5da6490461b333ab4537a7a09ad4fc7826a008 (patch)
tree83e2e4aa1e9739a0e852cd4f2329bf368495e6aa
parentf9324af88a99eca28b160fa31aa4516fd397e44b (diff)
downloadopenembedded-core-contrib-8c5da6490461b333ab4537a7a09ad4fc7826a008.tar.gz
base.bbclass: Add buildcfg multilib values
When displaying the buildcfg for the end user, add in processing of the multilib variants. Only the items that are not the same as the DEFAULTTUNE are displayed. I.e.: Build Configuration: BB_VERSION = "1.19.0" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "CentOS-6.4" DISTRO_VERSION = "oe-core.0" MACHINE = "qemux86-64" DEFAULTTUNE = "x86-64" TARGET_SYS = "x86_64-oe-linux" TUNE_FEATURES = "m64" TARGET_FPU = "" lib32: DEFAULTTUNE = "x86" lib32: TARGET_SYS = "i586-oe-linux" lib32: TUNE_FEATURES = "m32" meta = "master:1975f3d7bbeb184489a5d0a2e0de231f317d3e1b" The order of the displayed elements was changed slightly to group the host information together, as well as group the target information together. Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-rw-r--r--meta/classes/base.bbclass13
-rw-r--r--meta/conf/bitbake.conf2
2 files changed, 13 insertions, 2 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 1a359a04b7..47ecff4fcd 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -188,7 +188,7 @@ def get_layers_branch_rev(d):
return layers_branch_rev
-BUILDCFG_FUNCS ??= "buildcfg_vars get_layers_branch_rev buildcfg_neededvars"
+BUILDCFG_FUNCS ??= "buildcfg_vars buildcfg_multilibs get_layers_branch_rev buildcfg_neededvars"
BUILDCFG_FUNCS[type] = "list"
def buildcfg_vars(d):
@@ -198,6 +198,17 @@ def buildcfg_vars(d):
if value is not None:
yield '%-20s = "%s"' % (var, value)
+def buildcfg_multilibs(d):
+ variants = d.getVar("MULTILIB_VARIANTS", True) or ""
+ for variant in variants.split():
+ localdata = get_multilib_datastore(variant, d)
+ statusvars = oe.data.typed_value('BUILDCFG_VARS', d)
+ for var in statusvars:
+ origvalue = d.getVar(var, True)
+ variantvalue = localdata.getVar(var, True)
+ if origvalue and variantvalue and origvalue != variantvalue:
+ yield '%-7s %-17s = "%s"' % (variant + ":", var, variantvalue)
+
def buildcfg_neededvars(d):
needed_vars = oe.data.typed_value("BUILDCFG_NEEDEDVARS", d)
pesteruser = []
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 8f73854599..3e0c36e0cc 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -698,7 +698,7 @@ PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native"
# Pre-build configuration output
BUILDCFG_HEADER = "Build Configuration:"
-BUILDCFG_VARS = "BB_VERSION BUILD_SYS NATIVELSBSTRING TARGET_SYS MACHINE DISTRO DISTRO_VERSION TUNE_FEATURES TARGET_FPU"
+BUILDCFG_VARS = "BB_VERSION BUILD_SYS NATIVELSBSTRING DISTRO DISTRO_VERSION MACHINE DEFAULTTUNE TARGET_SYS TUNE_FEATURES TARGET_FPU"
BUILDCFG_VARS[type] = "list"
BUILDCFG_NEEDEDVARS = "TARGET_ARCH TARGET_OS"
BUILDCFG_NEEDEDVARS[type] = "list"