[meta-freescale] [meta-fsl-ppc][PATCH 12/12] multilib: use ?= to allow overridden in local.conf

[Bob Cochran]

This patch does not apply properly.  See below plus a comment on commit 
log...


On 01/06/2015 11:33 PM, ting.liu at freescale.com wrote:
> From: Ting Liu <ting.liu at freescale.com>
>
> the multilib setting have already been moved to the machine
> configure file.


I'm not sure what you mean.  Aren't the machine config files the ones in 
"meta-fsl-ppc/conf/machine"  MULTILIBS is not set in any of machine conf 
files (e.g., t1040rdb-64b.conf).   The only conf files I see MULTILIBS 
being used are in the e5500 and e6500 include files.



according to the including order in bitbake.conf
> the machine configure file is after local.conf file.so the value
> in local.conf will be overridden. change to use ?=.
>
> This is useful when using external toolchain which does not need
> to enable multilib.
>
> Signed-off-by: Zongchun Yu <Zongchun.Yu at freescale.com>
> ---
>   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 a8b69dd..d6d3cfd 100644
> --- a/conf/machine/include/e5500-64b.inc
> +++ b/conf/machine/include/e5500-64b.inc
> @@ -7,7 +7,7 @@ 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"
>   USER_CLASSES_remove = "image-prelink"

I'm seeing errors when applying this patch.  I don't see a 
"USER_CLASSES_remove  = "image-prelink" line in these conf files.


>
> diff --git a/conf/machine/include/e6500-64b.inc b/conf/machine/include/e6500-64b.inc
> index 6b7297b..f98f402 100644
> --- a/conf/machine/include/e6500-64b.inc
> +++ b/conf/machine/include/e6500-64b.inc
> @@ -7,7 +7,7 @@ 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"
>   USER_CLASSES_remove = "image-prelink"

Line doesn't exist

>
> 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"
>
>