From 909dd5b306bbfe43ee279a60ede21137ec5ce704 Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Wed, 28 Sep 2011 19:44:29 +0800 Subject: 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 Signed-off-by: Richard Purdie --- meta/conf/machine/include/tune-i586.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/conf') 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 @@ 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 -- cgit v1.2.3-54-g00ecf