summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQing He <qing.he@intel.com>2011-04-02 16:09:18 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-04 17:28:04 +0100
commitde3e3e25ea1966ad29c28c9882008e27c214ab1d (patch)
tree98d8a9354ab20dc0e81001a0f3652dfa405e7b3a
parentb2d4c658f56a501cb245c777ce2a8e112f199feb (diff)
downloadpoky-de3e3e25ea1966ad29c28c9882008e27c214ab1d.tar.gz
bitbake.conf: fix MACHINE_ARCH
Replaces all '-' in $MACHINE to '_', fixes [YOCTO #946] (From OE-Core rev: 69b3a11d90579bca687ad3461e7a5cd325079fe6) Signed-off-by: Qing He <qing.he@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/bitbake.conf3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 56c7bbb42c..a825c17236 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -92,8 +92,7 @@ SDK_CC_ARCH = "${BUILD_CC_ARCH}"
92 92
93BASE_PACKAGE_ARCH = "${HOST_ARCH}" 93BASE_PACKAGE_ARCH = "${HOST_ARCH}"
94PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" 94PACKAGE_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))]}" 95MACHINE_ARCH = "${@[bb.data.getVar('BASE_PACKAGE_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))].replace('-', '_')}"
96MACHINE_ARCH_qemux86-64 = "qemux86_64"
97PACKAGE_EXTRA_ARCHS ??= "${TARGET_ARCH}" 96PACKAGE_EXTRA_ARCHS ??= "${TARGET_ARCH}"
98PACKAGE_ARCHS = "all any noarch ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}" 97PACKAGE_ARCHS = "all any noarch ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}"
99# MACHINE shouldn't be included here as a variable dependency since machine specific 98# MACHINE shouldn't be included here as a variable dependency since machine specific