From dc2e2ff97a6f8a83ac922c395f70d21eecc60fce Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Fri, 9 Jan 2015 17:09:10 +0800 Subject: [PATCH] multilib: use ?= to allow overridden in local.conf The multilib setting was set in .inc which was included by the .conf. In bitbake.conf, .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 --- meta-fsl-ppc/conf/machine/include/e5500-64b.inc | 4 ++-- meta-fsl-ppc/conf/machine/include/e6500-64b.inc | 4 ++-- meta-fsl-ppc/conf/machine/include/e6500.inc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-fsl-ppc/conf/machine/include/e5500-64b.inc b/meta-fsl-ppc/conf/machine/include/e5500-64b.inc index 07e6274e..d238ca89 100644 --- a/meta-fsl-ppc/conf/machine/include/e5500-64b.inc +++ b/meta-fsl-ppc/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/meta-fsl-ppc/conf/machine/include/e6500-64b.inc b/meta-fsl-ppc/conf/machine/include/e6500-64b.inc index aa722a51..522ee71f 100644 --- a/meta-fsl-ppc/conf/machine/include/e6500-64b.inc +++ b/meta-fsl-ppc/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/meta-fsl-ppc/conf/machine/include/e6500.inc b/meta-fsl-ppc/conf/machine/include/e6500.inc index e6848bdc..4121fbef 100644 --- a/meta-fsl-ppc/conf/machine/include/e6500.inc +++ b/meta-fsl-ppc/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" -- 2.40.1