diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-12 16:00:57 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-12 16:00:57 +0000 |
commit | 4988dd7281a0e88c7db180b898aa4e4bbc50dd56 (patch) | |
tree | 4e4ca5e3f27ddb0a0d91d490d5a9240b4417bbeb /meta/conf/bitbake.conf | |
parent | 25b3d39612c0bea1d136e346d938abde56aa699f (diff) | |
download | poky-4988dd7281a0e88c7db180b898aa4e4bbc50dd56.tar.gz |
bitbake.conf: Whitelist MACHINE variable in PACKAGE_ARCHS
PACKAGE_ARCHS represents all compatible architectures for a given machine.
It makes no sense for this variable to change any task checksums as it doesn't
inject any machine dependency into any known task. Multimachine means machine
specific packages will be detected through other variables.
Before this patch, even native packaging tasks were ending up being marked as
machine specific.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/bitbake.conf')
-rw-r--r-- | meta/conf/bitbake.conf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 376e3cf384..aa34008abe 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -93,6 +93,9 @@ BASE_PACKAGE_ARCH = "${HOST_ARCH}" | |||
93 | PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" | 93 | PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" |
94 | MACHINE_ARCH = "${@[bb.data.getVar('BASE_PACKAGE_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}" | 94 | MACHINE_ARCH = "${@[bb.data.getVar('BASE_PACKAGE_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}" |
95 | PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}" | 95 | PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}" |
96 | # MACHINE shouldn't be included here as a variable dependency since machine specific | ||
97 | # packages are handled using multimachine | ||
98 | PACKAGE_ARCHS[vardepsexclude] = "MACHINE" | ||
96 | 99 | ||
97 | MULTIMACH_ARCH = "${PACKAGE_ARCH}" | 100 | MULTIMACH_ARCH = "${PACKAGE_ARCH}" |
98 | MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}" | 101 | MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}" |