[OE-core] [PATCH] bitbake.conf: fix distro-less failure expanding FILESPATH
Denys Dmytriyenko
denis at denix.org
Thu Mar 22 01:33:03 UTC 2012
From: Denys Dmytriyenko <denys at 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 at 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"
--
1.7.8.5
More information about the Openembedded-core
mailing list