From 472a3b34d80bc7aa7db1c27824fd3a31a6605536 Mon Sep 17 00:00:00 2001 From: Qing He Date: Sat, 2 Apr 2011 16:09:18 +0800 Subject: bitbake.conf: fix MACHINE_ARCH Replaces all '-' in $MACHINE to '_', fixes [YOCTO #946] (From OE-Core rev: 69b3a11d90579bca687ad3461e7a5cd325079fe6) Signed-off-by: Qing He Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta') diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 2cd115dfa0..776097315c 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -92,9 +92,9 @@ 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" -PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}" +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 # packages are handled using multimachine PACKAGE_ARCHS[vardepsexclude] = "MACHINE" -- cgit v1.2.3-54-g00ecf