diff options
| author |   Koen Kooi <koen@dominion.thruhere.net> | 2011-05-24 16:04:20 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-30 08:31:53 +0100 |
| commit | 83ce96f44516c8a4a44c8c0140949256f8422014 (patch) | |
| tree | b19261c899fe19f3c8fe3f03a2b602ab5268fc8c | |
| parent | 8a5117d54057987b9bf470e5e0011800ca221a8c (diff) | |
| download | openembedded-core-contrib-83ce96f44516c8a4a44c8c0140949256f8422014.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'
| -rw-r--r-- | meta/conf/bitbake.conf | 12 |
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}" # # This means that an envionment variable named '<foo>_arm' overrides an # environment variable '<foo>' (when ${TARGET_ARCH} is arm). -# An environment variable '<foo>_ramses' overrides '<foo>' but doesn't override -# '<foo>_arm' when ${MACHINE} is 'ramses'. -# If you use combination ie '<foo>_arm_ramses', then '<foo>_arm_ramses' will override -# '<foo>_arm' and then '<foo>' will be overriden with that value from '<foo>_arm'. -# And finally '<foo>_local' overrides any standard variable, but with lowest priority. +# An environment variable '<foo>_qemuarm' overrides '<foo>' and overrides +# '<foo>_arm' when ${MACHINE} is 'qemuarm'. +# If you use combination ie '<foo>_qemuarm_arm', then '<foo>_qemuarm_arm' will override +# '<foo>_qemuarm' and then '<foo>' will be overriden with that value from '<foo>_qemuarm'. +# And finally '<foo>_forcevariable' overrides any standard variable, with the highest priority. # # 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 = "local:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}:forcevariable" +OVERRIDES = "${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:forcevariable" DISTROOVERRIDES ?= "${DISTRO}" MACHINEOVERRIDES ?= "${MACHINE}" |