[oe-commits] Richard Purdie : meta-environment: Fix TARGET_OS problem for ppc

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: ae265973c96ff4b8b5580436647fc361490e134c
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ae265973c96ff4b8b5580436647fc361490e134c

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Fri Sep 19 18:08:40 2014 +0100

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 at linuxfoundation.org>

---

 meta/recipes-core/meta/meta-environment.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb
index cf142ef..c80f8a8 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"