[OE-core] [PATCH] bitbake.conf: do not let DISTROOVERRIDES fall back to empty string

Masahiro Yamada masahiroy at kernel.org
Fri Feb 14 05:18:07 UTC 2020


Hi.

On Mon, Jan 13, 2020 at 9:37 PM Masahiro Yamada <masahiroy at kernel.org> wrote:
>
> Commit abacd7243a2e ("bitbake.conf: fix distro-less failure expanding
> FILESPATH") mended the littered DISROOVERRIDES when DISTRO is unset.
>
> Some time later, commit b7279f996397 ("bitbake.conf: Default DISTRO to
> nodistro") added a weak default to 'DISTRO'.
>
> So, this line can go back to the original simple definition.
>
> Signed-off-by: Masahiro Yamada <masahiroy at kernel.org>


Please let me ping this in case this was missed.
This looks like a good clean-up to me.



> ---
>
>  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 62b5466b71..d2b6ca840f 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -736,7 +736,7 @@ DISTRO_NAME ??= "OpenEmbedded"
>  OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOVERRIDE}:forcevariable"
>  LIBCOVERRIDE ?= ""
>  CLASSOVERRIDE ?= "class-target"
> -DISTROOVERRIDES ?= "${@d.getVar('DISTRO') or ''}"
> +DISTROOVERRIDES ?= "${DISTRO}"
>  MACHINEOVERRIDES ?= "${MACHINE}"
>
>  FILESOVERRIDES = "${TRANSLATED_TARGET_ARCH}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}"
> --
> 2.17.1
>


-- 
Best Regards
Masahiro Yamada


More information about the Openembedded-core mailing list