summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2012-03-21 21:33:03 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-22 16:41:28 +0000
commitabacd7243a2e4cca216797c4a36ff66ae968ddbd (patch)
treeaae3629a0a0873a58754eb00e6586e0f10d39bee /meta
parentd036265de1d9931bedb660e01a763d3d1d9e4097 (diff)
downloadopenembedded-core-abacd7243a2e4cca216797c4a36ff66ae968ddbd.tar.gz
openembedded-core-abacd7243a2e4cca216797c4a36ff66ae968ddbd.tar.bz2
openembedded-core-abacd7243a2e4cca216797c4a36ff66ae968ddbd.tar.xz
openembedded-core-abacd7243a2e4cca216797c4a36ff66ae968ddbd.zip
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@ti.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/bitbake.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 07982d783..a9fcf052c 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"