summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-19 18:08:40 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-22 12:57:12 +0100
commitae265973c96ff4b8b5580436647fc361490e134c (patch)
tree5024c9ebb6c4d36273768430fd3ae391fe4d5b4f
parent0cc59247ece1ea134d060d3ff064b5561972a92b (diff)
downloadopenembedded-core-contrib-ae265973c96ff4b8b5580436647fc361490e134c.tar.gz
openembedded-core-contrib-ae265973c96ff4b8b5580436647fc361490e134c.tar.bz2
openembedded-core-contrib-ae265973c96ff4b8b5580436647fc361490e134c.zip
meta-environment: Fix TARGET_OS problem for ppc
Due to the use of the cross-canadian inherit, TARGET_OS can be reset to values other than the correct one, leading to generation of the wrong files. By expanding REAL_MULTIMACH_TARGET_SYS before the inherit, the correct OS value is preserved and we generate the right environment files. [YOCTO #6608] [YOCTO #6613] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/meta/meta-environment.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb
index cf142ef5ca..c80f8a8808 100644
--- a/meta/recipes-core/meta/meta-environment.bb
+++ b/meta/recipes-core/meta/meta-environment.bb
@@ -6,9 +6,10 @@ PR = "r8"
EXCLUDE_FROM_WORLD = "1"
+REAL_MULTIMACH_TARGET_SYS := "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}"
+
inherit toolchain-scripts
TOOLCHAIN_NEED_CONFIGSITE_CACHE += "zlib"
-REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}"
SDK_DIR = "${WORKDIR}/sdk"
SDK_OUTPUT = "${SDK_DIR}/image"