summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-05-24 16:04:20 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-30 08:33:24 +0100
commitcdc3397262f588a901364315580256ad39cca0ac (patch)
tree2ff0002ace5cf5571a666cc13fec02eefd2248dd /meta/conf
parented93e02b5789835958aa80f6fb26397d77468397 (diff)
downloadpoky-cdc3397262f588a901364315580256ad39cca0ac.tar.gz
bitbake.conf: make OVERRIDES match what people expect
In the current situation TARGET_ARCH will override MACHINE, which is counter intuitive since the machine is more specific than the arch. The order is now pn-$PN} -> arch -> machine -> distro as the machine is a set of defaults and the distro is the ultimate policy. 'failfast' has been removed since it's not used anymore, just like 'local' Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 8ec0a86e2c..de943161d7 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -619,15 +619,15 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
619# 619#
620# This means that an envionment variable named '<foo>_arm' overrides an 620# This means that an envionment variable named '<foo>_arm' overrides an
621# environment variable '<foo>' (when ${TARGET_ARCH} is arm). 621# environment variable '<foo>' (when ${TARGET_ARCH} is arm).
622# An environment variable '<foo>_ramses' overrides '<foo>' but doesn't override 622# An environment variable '<foo>_qemuarm' overrides '<foo>' and overrides
623# '<foo>_arm' when ${MACHINE} is 'ramses'. 623# '<foo>_arm' when ${MACHINE} is 'qemuarm'.
624# If you use combination ie '<foo>_arm_ramses', then '<foo>_arm_ramses' will override 624# If you use combination ie '<foo>_qemuarm_arm', then '<foo>_qemuarm_arm' will override
625# '<foo>_arm' and then '<foo>' will be overriden with that value from '<foo>_arm'. 625# '<foo>_qemuarm' and then '<foo>' will be overriden with that value from '<foo>_qemuarm'.
626# And finally '<foo>_local' overrides any standard variable, but with lowest priority. 626# And finally '<foo>_forcevariable' overrides any standard variable, with the highest priority.
627# 627#
628# This works for functions as well, they are really just environment variables. 628# This works for functions as well, they are really just environment variables.
629# Default OVERRIDES to make compilation fail fast in case of build system misconfiguration. 629# Default OVERRIDES to make compilation fail fast in case of build system misconfiguration.
630OVERRIDES = "local:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}:forcevariable" 630OVERRIDES = "${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:forcevariable"
631DISTROOVERRIDES ?= "${DISTRO}" 631DISTROOVERRIDES ?= "${DISTRO}"
632MACHINEOVERRIDES ?= "${MACHINE}" 632MACHINEOVERRIDES ?= "${MACHINE}"
633 633