diff options
| author | Dongxiao Xu <dongxiao.xu@intel.com> | 2011-09-28 19:44:29 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-28 21:41:45 +0100 |
| commit | 0f7bf53faaae46d16c9c49cc68645557a5504570 (patch) | |
| tree | 377c4097ef17eeb2762266a162b6a4d1fd910b03 /meta/conf | |
| parent | ccf807a013d9c564d526c16820ecaf8de886f2b1 (diff) | |
| download | poky-0f7bf53faaae46d16c9c49cc68645557a5504570.tar.gz | |
tune-i586: fix hardcoded TUNE_PKGARCH
Use TUNE_FEATURES to determine the setting to TUNE_PKGARCH, which fixes
the wrong setting of PACKAGE_ARCH in multilib case.
(From OE-Core rev: 0762e1ff5e29487f5b25a069e31257275415a3e6)
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/machine/include/tune-i586.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/conf/machine/include/tune-i586.inc b/meta/conf/machine/include/tune-i586.inc index ba655b94d3..a40ce1857a 100644 --- a/meta/conf/machine/include/tune-i586.inc +++ b/meta/conf/machine/include/tune-i586.inc | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | DEFAULTTUNE ?= "i586" | 1 | DEFAULTTUNE ?= "i586" |
| 2 | TUNE_PKGARCH ?= "i586" | 2 | TUNE_PKGARCH_TMP = "${@bb.utils.contains("TUNE_FEATURES", "m32", "x86", "x86_64", d)}" |
| 3 | TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "i586", "i586", TUNE_PKGARCH_TMP, d)}" | ||
| 3 | 4 | ||
| 4 | require conf/machine/include/ia32/arch-ia32.inc | 5 | require conf/machine/include/ia32/arch-ia32.inc |
| 5 | 6 | ||