diff options
| author |   Qing He <qing.he@intel.com> | 2011-04-02 16:09:18 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-04 14:11:54 +0100 |
| commit | 69b3a11d90579bca687ad3461e7a5cd325079fe6 (patch) | |
| tree | dc2310a4507cff3e476c04101d4fa81411624e54 /meta/conf | |
| parent | b99166344ff8147f15e30b52946f68dfc5c25eda (diff) | |
| download | openembedded-core-69b3a11d90579bca687ad3461e7a5cd325079fe6.tar.gz | |
bitbake.conf: fix MACHINE_ARCH
Replaces all '-' in $MACHINE to '_', fixes [YOCTO #946]
Signed-off-by: Qing He <qing.he@intel.com>
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/bitbake.conf | 3 |
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}" 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 |