Patchwork bitbake.conf: fix distro-less failure expanding FILESPATH

login
register
mail settings
Submitter Denys Dmytriyenko
Date March 22, 2012, 1:33 a.m.
Message ID <1332379983-2512-1-git-send-email-denis@denix.org>
Download mbox | patch
Permalink /patch/24077/
State Accepted
Commit abacd7243a2e4cca216797c4a36ff66ae968ddbd
Headers show

Comments

Denys Dmytriyenko - March 22, 2012, 1:33 a.m.
From: Denys Dmytriyenko <denys@ti.com>

If DISTRO is not set, FILESPATH becomes littered with directories like
files/${DISTRO} etc. It won't bomb until you try to eval it - i.e.
manipulating FILESPATH directly with .= works fine, but calling e.g.
base_set_filespath() throws this:

ERROR: Failure expanding variable FILESPATH, expression was ${@blah} which
triggered exception SyntaxError: EOL while scanning string literal (FILESPATH,
line 1)

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta/conf/bitbake.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Saul Wold - March 22, 2012, 5:34 p.m.
On 03/21/2012 06:33 PM, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko<denys@ti.com>
>
> If DISTRO is not set, FILESPATH becomes littered with directories like
> files/${DISTRO} etc. It won't bomb until you try to eval it - i.e.
> manipulating FILESPATH directly with .= works fine, but calling e.g.
> base_set_filespath() throws this:
>
> ERROR: Failure expanding variable FILESPATH, expression was ${@blah} which
> triggered exception SyntaxError: EOL while scanning string literal (FILESPATH,
> line 1)
>
> Signed-off-by: Denys Dmytriyenko<denys@ti.com>
> ---
>   meta/conf/bitbake.conf |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 17d2f26..16e72e4 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -637,7 +637,7 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
>   # This works for  functions as well, they are really just environment variables.
>   # Default OVERRIDES to make compilation fail fast in case of build system misconfiguration.
>   OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:forcevariable"
> -DISTROOVERRIDES ?= "${DISTRO}"
> +DISTROOVERRIDES ?= "${@d.getVar('DISTRO', True) or ''}"
>   MACHINEOVERRIDES ?= "${MACHINE}"
>   MACHINEOVERRIDES[vardepsexclude] = "MACHINE"
>

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 17d2f26..16e72e4 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -637,7 +637,7 @@  AUTO_LIBNAME_PKGS = "${PACKAGES}"
 # This works for  functions as well, they are really just environment variables.
 # Default OVERRIDES to make compilation fail fast in case of build system misconfiguration.
 OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:forcevariable"
-DISTROOVERRIDES ?= "${DISTRO}"
+DISTROOVERRIDES ?= "${@d.getVar('DISTRO', True) or ''}"
 MACHINEOVERRIDES ?= "${MACHINE}"
 MACHINEOVERRIDES[vardepsexclude] = "MACHINE"