From: Ting Liu <[email protected]> The multilib setting was set in <core>.inc which was included by the <machine>.conf. In bitbake.conf, <machine>.conf is included after local.conf. Change to use ?= to not override the value in local.conf.
This is useful when using external toolchain which does not need to enable multilib. Signed-off-by: Zongchun Yu <[email protected]> --- conf/machine/include/e5500-64b.inc | 4 ++-- conf/machine/include/e6500-64b.inc | 4 ++-- conf/machine/include/e6500.inc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/machine/include/e5500-64b.inc b/conf/machine/include/e5500-64b.inc index 07e6274..d238ca8 100644 --- a/conf/machine/include/e5500-64b.inc +++ b/conf/machine/include/e5500-64b.inc @@ -7,6 +7,6 @@ require conf/machine/include/qoriq-base.inc MACHINEOVERRIDES .= ":e5500-64b" require conf/multilib.conf -MULTILIBS = "multilib:lib32" -DEFAULTTUNE_virtclass-multilib-lib32 = "ppce5500" +MULTILIBS ?= "multilib:lib32" +DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce5500" diff --git a/conf/machine/include/e6500-64b.inc b/conf/machine/include/e6500-64b.inc index aa722a5..522ee71 100644 --- a/conf/machine/include/e6500-64b.inc +++ b/conf/machine/include/e6500-64b.inc @@ -7,6 +7,6 @@ require conf/machine/include/qoriq-base.inc MACHINEOVERRIDES .= ":e6500-64b" require conf/multilib.conf -MULTILIBS = "multilib:lib32" -DEFAULTTUNE_virtclass-multilib-lib32 = "ppce6500" +MULTILIBS ?= "multilib:lib32" +DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce6500" diff --git a/conf/machine/include/e6500.inc b/conf/machine/include/e6500.inc index e6848bd..4121fbe 100644 --- a/conf/machine/include/e6500.inc +++ b/conf/machine/include/e6500.inc @@ -8,6 +8,6 @@ MACHINEOVERRIDES .= ":e6500" BUILD_64BIT_KERNEL = "1" require conf/multilib.conf -MULTILIBS = "multilib:lib64" -DEFAULTTUNE_virtclass-multilib-lib64 = "ppc64e6500" +MULTILIBS ?= "multilib:lib64" +DEFAULTTUNE_virtclass-multilib-lib64 ?= "ppc64e6500" -- 1.9.1 -- _______________________________________________ meta-freescale mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-freescale
