[oe-commits] Denys Dmytriyenko : bitbake.conf: fix distro-less failure expanding FILESPATH

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: abacd7243a2e4cca216797c4a36ff66ae968ddbd
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=abacd7243a2e4cca216797c4a36ff66ae968ddbd

Author: Denys Dmytriyenko <denys at ti.com>
Date:   Wed Mar 21 21:33:03 2012 -0400

bitbake.conf: fix distro-less failure expanding FILESPATH

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 at ti.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 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 07982d7..a9fcf05 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -638,7 +638,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"