diff options
| author | Qing He <qing.he@intel.com> | 2011-04-02 16:09:18 +0800 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2011-05-04 15:43:24 -0700 |
| commit | 472a3b34d80bc7aa7db1c27824fd3a31a6605536 (patch) | |
| tree | 939d24e8c95defec79391eafbef70f0fdf700cda /meta/conf | |
| parent | 3c81ae17ea134c320551168e0b7f4d0b100a05d8 (diff) | |
| download | poky-472a3b34d80bc7aa7db1c27824fd3a31a6605536.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>
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/bitbake.conf | 6 |
1 files changed, 3 insertions, 3 deletions
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}" | |||
| 92 | 92 | ||
| 93 | BASE_PACKAGE_ARCH = "${HOST_ARCH}" | 93 | BASE_PACKAGE_ARCH = "${HOST_ARCH}" |
| 94 | PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" | 94 | PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" |
| 95 | MACHINE_ARCH = "${@[bb.data.getVar('BASE_PACKAGE_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}" | 95 | MACHINE_ARCH = "${@[bb.data.getVar('BASE_PACKAGE_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))].replace('-', '_')}" |
| 96 | MACHINE_ARCH_qemux86-64 = "qemux86_64" | 96 | PACKAGE_EXTRA_ARCHS ??= "${TARGET_ARCH}" |
| 97 | PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}" | 97 | PACKAGE_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 shouldn't be included here as a variable dependency since machine specific |
| 99 | # packages are handled using multimachine | 99 | # packages are handled using multimachine |
| 100 | PACKAGE_ARCHS[vardepsexclude] = "MACHINE" | 100 | PACKAGE_ARCHS[vardepsexclude] = "MACHINE" |