[PATCH] bitbake.conf: add BB_CURRENT_MC to OVERRIDES

[PATCH] bitbake.conf: add BB_CURRENT_MC to OVERRIDES

[liu.ming50]

From: Ming Liu <liu.ming50@gmail.com>

This is useful when the users want different variables/tasks when using
multiconfig.

Signed-off-by: Ming Liu <liu.ming50@gmail.com>
---
 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 3b2ef9f..8b2555b 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -731,7 +731,7 @@ DISTRO_NAME ??= "OpenEmbedded"
 # And finally '<foo>_forcevariable' overrides any standard variable, with the highest priority.
 # This works for functions as well, they are really just variables.
 #
-OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOVERRIDE}:forcevariable"
+OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOVERRIDE}:${BB_CURRENT_MC}:forcevariable"
 LIBCOVERRIDE ?= ""
 CLASSOVERRIDE ?= "class-target"
 DISTROOVERRIDES ?= "${@d.getVar('DISTRO') or ''}"
-- 
2.7.4

Re: [PATCH] bitbake.conf: add BB_CURRENT_MC to OVERRIDES

[Richard Purdie]

On Sat, 2018-06-09 at 17:24 +0200, liu.ming50@gmail.com wrote:
> From: Ming Liu <liu.ming50@gmail.com>
> 
> This is useful when the users want different variables/tasks when
> using
> multiconfig.
> 
> Signed-off-by: Ming Liu <liu.ming50@gmail.com>
> ---
>  meta/conf/bitbake.conf | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 3b2ef9f..8b2555b 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -731,7 +731,7 @@ DISTRO_NAME ??= "OpenEmbedded"
>  # And finally '<foo>_forcevariable' overrides any standard variable,
> with the highest priority.
>  # This works for functions as well, they are really just variables.
>  #
> -OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-
> ${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOV
> ERRIDE}:forcevariable"
> +OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-
> ${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOV
> ERRIDE}:${BB_CURRENT_MC}:forcevariable"
>  LIBCOVERRIDE ?= ""
>  CLASSOVERRIDE ?= "class-target"
>  DISTROOVERRIDES ?= "${@d.getVar('DISTRO') or ''}"

This adds "" in OVERRIDES in the default case. Whilst I think (but am
not 100% sure) we fixed bitbake not to break on such a value, I'm not
convinced adding empty elements to it is a good idea and this did used
to break things.

Cheers,

Richard

Re: [PATCH] bitbake.conf: add BB_CURRENT_MC to OVERRIDES

[Ming Liu]

[-- Attachment #1: Type: text/plain, Size: 1566 bytes --]

Hi, Richard:

I saw your comment as follows:

> This adds "" in OVERRIDES in the default case. Whilst I think (but am not
100% sure) we fixed bitbake not to break on such a value, I'm not convinced
adding empty elements to it is a good idea and this did used to break
things.

No, it will add "default" to OVERRIDES in the default case.

//Ming Liu


2018-06-09 17:24 GMT+02:00 <liu.ming50@gmail.com>:

> From: Ming Liu <liu.ming50@gmail.com>
>
> This is useful when the users want different variables/tasks when using
> multiconfig.
>
> Signed-off-by: Ming Liu <liu.ming50@gmail.com>
> ---
>  meta/conf/bitbake.conf | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 3b2ef9f..8b2555b 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -731,7 +731,7 @@ DISTRO_NAME ??= "OpenEmbedded"
>  # And finally '<foo>_forcevariable' overrides any standard variable, with
> the highest priority.
>  # This works for functions as well, they are really just variables.
>  #
> -OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-${PN}:${
> MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOVERRIDE}:
> forcevariable"
> +OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-${PN}:${
> MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOVERRIDE}:
> ${BB_CURRENT_MC}:forcevariable"
>  LIBCOVERRIDE ?= ""
>  CLASSOVERRIDE ?= "class-target"
>  DISTROOVERRIDES ?= "${@d.getVar('DISTRO') or ''}"
> --
> 2.7.4
>
>

[-- Attachment #2: Type: text/html, Size: 3421 bytes --]

Re: [PATCH] bitbake.conf: add BB_CURRENT_MC to OVERRIDES

[Richard Purdie]

On Sun, 2018-06-10 at 20:45 +0200, Ming Liu wrote:
> I saw your comment as follows:
> 
> > This adds "" in OVERRIDES in the default case. Whilst I think (but
> am not 100% sure) we fixed bitbake not to break on such a value, I'm
> not convinced adding empty elements to it is a good idea and this did
> used to break things.
> 
> No, it will add "default" to OVERRIDES in the default case.

That is even worse, we do not want to add "default" to overrides since
any variable containing that word would then be at risk of weird
breakage.

Cheers,

Richard

Re: [PATCH] bitbake.conf: add BB_CURRENT_MC to OVERRIDES

[Peter Kjellerstedt]

> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> Richard Purdie
> Sent: den 10 juni 2018 21:29
> To: Ming Liu <liu.ming50@gmail.com>; OE-core <openembedded-
> core@lists.openembedded.org>
> Subject: Re: [OE-core] [PATCH] bitbake.conf: add BB_CURRENT_MC to
> OVERRIDES
> 
> On Sun, 2018-06-10 at 20:45 +0200, Ming Liu wrote:
> > I saw your comment as follows:
> >
> > > This adds "" in OVERRIDES in the default case. Whilst I think (but
> > am not 100% sure) we fixed bitbake not to break on such a value, I'm
> > not convinced adding empty elements to it is a good idea and this did
> > used to break things.
> >
> > No, it will add "default" to OVERRIDES in the default case.
> 
> That is even worse, we do not want to add "default" to overrides since
> any variable containing that word would then be at risk of weird
> breakage.
> 
> Cheers,
> 
> Richard

You could add it as ":mc-${BB_CURRENT_MC}:" to OVERRIDES to avoid the 
ambiguity, similar to the pn- and df- prefixes used for recipe names 
and distro features.

//Peter

Re: [PATCH] bitbake.conf: add BB_CURRENT_MC to OVERRIDES

[Ming Liu]

[-- Attachment #1: Type: text/plain, Size: 1379 bytes --]

Arha, good suggestion, will do that in V2.

//Ming Liu

2018-06-11 10:51 GMT+02:00 Peter Kjellerstedt <peter.kjellerstedt@axis.com>:

> > -----Original Message-----
> > From: openembedded-core-bounces@lists.openembedded.org
> > [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> > Richard Purdie
> > Sent: den 10 juni 2018 21:29
> > To: Ming Liu <liu.ming50@gmail.com>; OE-core <openembedded-
> > core@lists.openembedded.org>
> > Subject: Re: [OE-core] [PATCH] bitbake.conf: add BB_CURRENT_MC to
> > OVERRIDES
> >
> > On Sun, 2018-06-10 at 20:45 +0200, Ming Liu wrote:
> > > I saw your comment as follows:
> > >
> > > > This adds "" in OVERRIDES in the default case. Whilst I think (but
> > > am not 100% sure) we fixed bitbake not to break on such a value, I'm
> > > not convinced adding empty elements to it is a good idea and this did
> > > used to break things.
> > >
> > > No, it will add "default" to OVERRIDES in the default case.
> >
> > That is even worse, we do not want to add "default" to overrides since
> > any variable containing that word would then be at risk of weird
> > breakage.
> >
> > Cheers,
> >
> > Richard
>
> You could add it as ":mc-${BB_CURRENT_MC}:" to OVERRIDES to avoid the
> ambiguity, similar to the pn- and df- prefixes used for recipe names
> and distro features.
>
> //Peter
>
>

[-- Attachment #2: Type: text/html, Size: 2262 bytes --]