summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-09-28 19:44:29 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-04 13:59:31 +0100
commit909dd5b306bbfe43ee279a60ede21137ec5ce704 (patch)
tree5118b8fcac1b0f77a06b2e5154d63058c412b0b5
parent24623d149db7ab07088ddbd505942bdb5b24eebd (diff)
downloadpoky-909dd5b306bbfe43ee279a60ede21137ec5ce704.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: d8051ce1af7a5a4b72c1f772ed35eff24a4beb6b) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/machine/include/tune-i586.inc3
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 @@
1DEFAULTTUNE ?= "i586" 1DEFAULTTUNE ?= "i586"
2TUNE_PKGARCH ?= "i586" 2TUNE_PKGARCH_TMP = "${@bb.utils.contains("TUNE_FEATURES", "m32", "x86", "x86_64", d)}"
3TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "i586", "i586", TUNE_PKGARCH_TMP, d)}"
3 4
4require conf/machine/include/ia32/arch-ia32.inc 5require conf/machine/include/ia32/arch-ia32.inc
5 6