summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/meta
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2014-11-10 20:09:29 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-13 15:43:38 +0000
commit9fcd5826d9d6cfc6cec2423a59cb05180e54cb06 (patch)
tree5ac7ecc49737ed883c39aad0581b62b245ee79a7 /meta/recipes-core/meta
parentdf87cb27efeaea1455f20692f9f1397c6fcab254 (diff)
downloadpoky-9fcd5826d9d6cfc6cec2423a59cb05180e54cb06.tar.gz
meta-environment: Fix config-site with a multilib config
[YOCTO #6951] The TOOLCHAIN_CONFIGSITE_SYSROOTCACHE value was defaulting to the nativesdk path and not the associated target path. Set the value in toolchain-scripts to the target path. Be sure to set the MLPREFIX within the meta-environment script as multilibs are processed. Update the config_site file name to use -BPN- not PN. Otherwise the environment processing can't find the correct filename. (From OE-Core rev: 26a2f98155a867a71217e52d33f761dcc60800ca) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/meta')
-rw-r--r--meta/recipes-core/meta/meta-environment.bb1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb
index 9d8bcb71de..bb208a39aa 100644
--- a/meta/recipes-core/meta/meta-environment.bb
+++ b/meta/recipes-core/meta/meta-environment.bb
@@ -42,6 +42,7 @@ python do_generate_content() {
42 # Load overrides from 'd' to avoid having to reset the value... 42 # Load overrides from 'd' to avoid having to reset the value...
43 overrides = d.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item 43 overrides = d.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item
44 localdata.setVar("OVERRIDES", overrides) 44 localdata.setVar("OVERRIDES", overrides)
45 localdata.setVar("MLPREFIX", item + "-")
45 bb.data.update_data(localdata) 46 bb.data.update_data(localdata)
46 bb.build.exec_func("create_sdk_files", localdata) 47 bb.build.exec_func("create_sdk_files", localdata)
47} 48}