diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2012-07-23 16:25:09 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-06 15:18:46 +0100 |
commit | 98e2ebeb308bd6ee74cecaa49cbe687e58d52f29 (patch) | |
tree | 79d0aeb56379f49fe15a268f17a936457f979d12 | |
parent | 8a4220a51e4bd7f76d522ecee5db29e24601cf29 (diff) | |
download | poky-98e2ebeb308bd6ee74cecaa49cbe687e58d52f29.tar.gz |
bitbake.conf: exclude whole MACHINEOVERRIDES from OVERRIDES vardeps
* whole MACHINEOVERRIDES can change e.g. between MACHINES with different arm architecture, causing allarch packages to reexecute do_package
bitbake-diffsigs ../shr-core/tmp-eglibc/stamps/all-oe-linux/xserver-nodm-init-2.0-r16.do_package.sigdata.90e760a8f6cecbd87cb2e95f1237e3cc ../shr-core/tmp-eglibc/stamps/all-oe-linux/xserver-nodm-init-2.0-r16.do_package.sigdata.9eeccfd15f25032b3b6b132534660fff
basehash changed from 7618e17d3fda05d1f15246e6800ca0f0 to 97bc4dc8c1521c535bd96b2aa62d8a03
Variable MACHINEOVERRIDES value changed from ${MACHINE}${@bb.utils.contains("TUNE_FEATURES", "armv5", ":armv5", "" ,d)}${@bb.utils.contains("TUNE_FEATURES", "armv4", ":armv4", "" ,d)}:${MACHINE_CLASS} to ${MACHINE}${@bb.utils.contains("TUNE_FEATURES", "armv7a", ":armv7a", "" ,d)}${@bb.utils.contains("TUNE_FEATURES", "armv6", ":armv6", "" ,d)}${@bb.utils.contains("TUNE_FEATURES", "armv5", ":armv5", "" ,d)}${@bb.utils.contains("TUNE_FEATURES", "armv4", ":armv4", "" ,d)}:${MACHINE_CLASS}
(From OE-Core rev: d205aa2b42a4676b1ba587c0375cd6ac7e18e9ce)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/conf/bitbake.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index f2d00aa327..d5a43e931a 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -656,6 +656,7 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}" | |||
656 | # This works for functions as well, they are really just environment variables. | 656 | # This works for functions as well, they are really just environment variables. |
657 | # Default OVERRIDES to make compilation fail fast in case of build system misconfiguration. | 657 | # Default OVERRIDES to make compilation fail fast in case of build system misconfiguration. |
658 | OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}:forcevariable" | 658 | OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}:forcevariable" |
659 | OVERRIDES[vardepsexclude] = "MACHINEOVERRIDES" | ||
659 | CLASSOVERRIDE ?= "class-target" | 660 | CLASSOVERRIDE ?= "class-target" |
660 | DISTROOVERRIDES ?= "${@d.getVar('DISTRO', True) or ''}" | 661 | DISTROOVERRIDES ?= "${@d.getVar('DISTRO', True) or ''}" |
661 | MACHINEOVERRIDES ?= "${MACHINE}" | 662 | MACHINEOVERRIDES ?= "${MACHINE}" |