summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-04-08 09:10:31 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-08 09:40:29 -0700
commit309e6f74a65702cdd6ce6a2f697b135b608b3ddc (patch)
treedcb9fdf916ac291eb127afe76389468498010919 /meta/conf
parentb0bf7ef11512219d2822647058db840fd8d45df0 (diff)
downloadpoky-309e6f74a65702cdd6ce6a2f697b135b608b3ddc.tar.gz
bitbake.conf: fix PACKAGE_ARCH[vardepsexclude]
(From OE-Core rev: 4040031c79bd69c00982f7e32aa9710bdc2b9c23) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index a825c17236..f4de612711 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -95,9 +95,9 @@ PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
95MACHINE_ARCH = "${@[bb.data.getVar('BASE_PACKAGE_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))].replace('-', '_')}" 95MACHINE_ARCH = "${@[bb.data.getVar('BASE_PACKAGE_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))].replace('-', '_')}"
96PACKAGE_EXTRA_ARCHS ??= "${TARGET_ARCH}" 96PACKAGE_EXTRA_ARCHS ??= "${TARGET_ARCH}"
97PACKAGE_ARCHS = "all any noarch ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}" 97PACKAGE_ARCHS = "all any noarch ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}"
98# MACHINE shouldn't be included here as a variable dependency since machine specific 98# MACHINE_ARCH shouldn't be included here as a variable dependency
99# packages are handled using multimachine 99# since machine specific packages are handled using multimachine
100PACKAGE_ARCHS[vardepsexclude] = "MACHINE" 100PACKAGE_ARCHS[vardepsexclude] = "MACHINE_ARCH"
101 101
102MULTIMACH_ARCH = "${PACKAGE_ARCH}" 102MULTIMACH_ARCH = "${PACKAGE_ARCH}"
103MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}" 103MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}"