[OE-core] [PATCH 6/6] meta-environment.bb: fix environment-setup* when populate mlprefix SDK

[Robert Yang]

Fixed when extract mutilib SDK like
poky-glibc-x86_64-lib32-core-image-minimal-core2-64-toolchain-1.8+snapshot.sh:

Each time you wish to use the SDK in a new shell session, you need to
source the environment setup script e.g.
 $ ./path/to/environment-setup-core2-64-pokymllib32-linux

There was no environment-setup-core2-64-pokymllib32-linux, but
environment-setup-x86-pokymllib32-linux, this was because image recipe
didn't upgrade TUNE_PKGARCH from core2-64 to x86, but meta-environment
did, let meta-environment not upgrade TUNE_PKGARCH will fix the
problem.

Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
---
 meta/recipes-core/meta/meta-environment.bb |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb
index 49d45f6..c671c13 100644
--- a/meta/recipes-core/meta/meta-environment.bb
+++ b/meta/recipes-core/meta/meta-environment.bb
@@ -42,6 +42,10 @@ python do_generate_content() {
         localdata.setVar("OVERRIDES", overrides)
         localdata.setVar("MLPREFIX", item + "-")
         bb.data.update_data(localdata)
+        # Don't upgrade TUNE_PKGARCH since image doesn't upgrade it,
+        # otherwise the siteconfig, env_script and version would
+        # mismatch image's REAL_MULTIMACH_TARGET_SYS.
+        localdata.setVar('TUNE_PKGARCH', d.getVar('TUNE_PKGARCH', True))
         bb.build.exec_func("create_sdk_files", localdata)
 }
 addtask generate_content before do_install after do_compile
-- 
1.7.9.5