[OE-core] [PATCH v4 1/7] bitbake.conf: support for merged usr with DISTRO_FEATURE usrmerge

Richard Purdie richard.purdie at linuxfoundation.org
Wed Jun 14 11:48:58 UTC 2017


On Wed, 2017-06-14 at 14:30 +0300, Amarnath Valluri wrote:
> A new configuration variable ${root_prefix} added, which shall be used by all
> base_{lib,bin,sbin}dir variables. When usrmerge DISTRO_FEATURE is enabled
> ${root_prefix} points to ${exec_prefix} otherwise to ${base_prefix}
> 
> Signed-off-by: Amarnath Valluri <amarnath.valluri at intel.com>
> ---
>  meta/conf/bitbake.conf | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 5d5ddec..8c497fd 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -17,11 +17,13 @@ export base_prefix = ""
>  export prefix = "/usr"
>  export exec_prefix = "${prefix}"
>  
> +export root_prefix = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '${exec_prefix}', '${base_prefix}', d)}"
> +

This is a really small nitpick but with changes to the core files we
need to get this right. Could you drop the "export " above please?

The reason is that we want to ultimately reduce the number of variables
we export into the global shell environment. Where we create new ones
like this which aren't needed in the global scope, we might as well not
export them right from the start...

Cheers,

Richard




More information about the Openembedded-core mailing list