[oe] [PATCH] bitbake.conf: don't append MACHINE_OVERRIDES to OVERRIDES when it's empty

[Maupin, Chase]

> -----Original Message-----
> From: openembedded-devel-bounces at lists.openembedded.org
> [mailto:openembedded-devel-bounces at lists.openembedded.org] On Behalf Of
> Martin Jansa
> Sent: Saturday, October 16, 2010 2:25 PM
> To: openembedded-devel at lists.openembedded.org
> Subject: [oe] [PATCH] bitbake.conf: don't append MACHINE_OVERRIDES to
> OVERRIDES when it's empty
> 
> * empty MACHINE_OVERRIDES adds :: to OVERRIDES (then in FILESPATH skips
>   every directory after this)
> * strip() is needed to remove space in case some distribution has ie
>   MACHINE_OVERRIDES ?= ""
>   and then
>   MACHINE_OVERRIDES += ""
>   or
>   MACHINE_OVERRIDES ?= "${MACHINE_CLASS}", where MACHINE_CLASS is empty
> again

I saw this issue in my overlay of having a "::" in my OVERRIDES which caused my parsing to fail in angstrom.inc.  Applying this fix from Martin resolves the parsing issue.  My OVERRIDES appear to be in the correct order with this change:

# OVERRIDES=${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}libc-glibc:pn-${PN}:fail-fast:build-${BUILD_OS}:${TARGET_ARCH}:${TARGET_OS}:${DISTRO}:${@[':'.join(d.getVar('MACHINE_OVERRIDES', True).split())+':',''][d.getVar('MACHINE_OVERRIDES', True).strip() == '']}${MACHINE}:local
OVERRIDES="thumb-interwork:libc-glibc:pn-helloworld:fail-fast:build-linux:arm:linux-gnueabi:angstrom:armv7a:omap3:am37x-evm:local"

And my FILESPATH ordering is:

helloworld-1.0.0-r1/local
helloworld-1.0.0-r1/am37x-evm
helloworld-1.0.0-r1/omap3
helloworld-1.0.0-r1/armv7a
helloworld-1.0.0-r1/angstrom
helloworld-1.0.0-r1/linux-gnueabi
helloworld-1.0.0-r1/arm
helloworld-1.0.0-r1/build-linux
helloworld-1.0.0-r1/fail-fast
helloworld-1.0.0-r1/pn-helloworld
helloworld-1.0.0-r1/libc-glibc
helloworld-1.0.0-r1/thumb-interwork
helloworld-1.0.0-r1/
.
.
.

Acked-by: Chase Maupin <chase.maupin at ti.com>

> ---
>  conf/bitbake.conf |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/conf/bitbake.conf b/conf/bitbake.conf
> index 155c593..5c45e1e 100644
> --- a/conf/bitbake.conf
> +++ b/conf/bitbake.conf
> @@ -676,8 +676,9 @@ BUILDCFG_NEEDEDVARS ?= "TARGET_ARCH TARGET_OS"
>  # Overrides are processed left to right, so the ones that are named later
> take precedence.
>  # You generally want them to go from least to most specific.
>  MACHINE_OVERRIDES ?= ""
> -OVERRIDES = "pn-${PN}:fail-fast:build-
> ${BUILD_OS}:${TARGET_ARCH}:${TARGET_OS}:\
> -${DISTRO}:${@':'.join(d.getVar('MACHINE_OVERRIDES',
> True).split())}:${MACHINE}:local"
> +OVERRIDES = "pn-${PN}:fail-fast:build-
> ${BUILD_OS}:${TARGET_ARCH}:${TARGET_OS}:${DISTRO}:\
> +${@[':'.join(d.getVar('MACHINE_OVERRIDES',
> True).split())+':',''][d.getVar('MACHINE_OVERRIDES', True).strip() ==
> '']}\
> +${MACHINE}:local"
> 
>  ##################################################################
>  # Include the rest of the config files.
> --
> 1.7.3.1
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel