From: Qing He <qing.he@intel.com>
Date: Sat, 2 Apr 2011 08:09:18 +0000 (+0800)
Subject: bitbake.conf: fix MACHINE_ARCH
X-Git-Tag: 2011-1~1868
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=69b3a11d90579bca687ad3461e7a5cd325079fe6;p=openembedded-core.git

bitbake.conf: fix MACHINE_ARCH

Replaces all '-' in $MACHINE to '_', fixes [YOCTO #946]

Signed-off-by: Qing He <qing.he@intel.com>
---

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}"
 
 BASE_PACKAGE_ARCH = "${HOST_ARCH}"
 PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
-MACHINE_ARCH = "${@[bb.data.getVar('BASE_PACKAGE_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}"
-MACHINE_ARCH_qemux86-64 = "qemux86_64"
+MACHINE_ARCH = "${@[bb.data.getVar('BASE_PACKAGE_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))].replace('-', '_')}"
 PACKAGE_EXTRA_ARCHS ??= "${TARGET_ARCH}"
 PACKAGE_ARCHS = "all any noarch ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}"
 # MACHINE shouldn't be included here as a variable dependency since machine specific