[oe-commits] Dongxiao Xu : tune-i586: fix hardcoded TUNE_PKGARCH

[git version control]

Module: openembedded-core.git
Branch: 2011-1
Commit: d8051ce1af7a5a4b72c1f772ed35eff24a4beb6b
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=d8051ce1af7a5a4b72c1f772ed35eff24a4beb6b

Author: Dongxiao Xu <dongxiao.xu at intel.com>
Date:   Wed Sep 28 19:44:29 2011 +0800

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.

Signed-off-by: Dongxiao Xu <dongxiao.xu at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 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 ba655b9..a40ce18 100644
--- a/meta/conf/machine/include/tune-i586.inc
+++ b/meta/conf/machine/include/tune-i586.inc
@@ -1,5 +1,6 @@
 DEFAULTTUNE ?= "i586"
-TUNE_PKGARCH ?= "i586"
+TUNE_PKGARCH_TMP = "${@bb.utils.contains("TUNE_FEATURES", "m32", "x86", "x86_64", d)}"
+TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "i586", "i586", TUNE_PKGARCH_TMP, d)}"
 
 require conf/machine/include/ia32/arch-ia32.inc