From: Denys Dmytriyenko Date: Thu, 22 Mar 2012 01:33:03 +0000 (-0400) Subject: bitbake.conf: fix distro-less failure expanding FILESPATH X-Git-Tag: 2015-4~11227 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=abacd7243a2e4cca216797c4a36ff66ae968ddbd;p=openembedded-core.git 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 Signed-off-by: Richard Purdie --- diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 07982d783d..a9fcf052c3 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"