summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2012-03-22 01:33:03 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-22 16:47:05 (GMT)
commite2e4e4a5a61c55f713f9eabebaf460626d14cf7c (patch)
treea0e2eda79c753113dcd00a610a44c0cf5ee57c7a /meta/conf
parent8dda137c12d284304a5b3e6693732b00f2b5553f (diff)
downloadpoky-e2e4e4a5a61c55f713f9eabebaf460626d14cf7c.tar.gz
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) (From OE-Core rev: abacd7243a2e4cca216797c4a36ff66ae968ddbd) Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-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 07982d7..a9fcf05 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -638,7 +638,7 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
638# This works for functions as well, they are really just environment variables. 638# This works for functions as well, they are really just environment variables.
639# Default OVERRIDES to make compilation fail fast in case of build system misconfiguration. 639# Default OVERRIDES to make compilation fail fast in case of build system misconfiguration.
640OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:forcevariable" 640OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:forcevariable"
641DISTROOVERRIDES ?= "${DISTRO}" 641DISTROOVERRIDES ?= "${@d.getVar('DISTRO', True) or ''}"
642MACHINEOVERRIDES ?= "${MACHINE}" 642MACHINEOVERRIDES ?= "${MACHINE}"
643MACHINEOVERRIDES[vardepsexclude] = "MACHINE" 643MACHINEOVERRIDES[vardepsexclude] = "MACHINE"
644 644