summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-19 18:09:12 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-22 13:04:23 +0100
commit955bf632a72abc339102fd8b1e1ad27cd300ccd0 (patch)
tree237e438766497e965e653a35733cf6cafe781145 /meta/recipes-core
parent6523bc171cdd06bed9c7a36aa2198b17b9c0a016 (diff)
downloadpoky-955bf632a72abc339102fd8b1e1ad27cd300ccd0.tar.gz
populate_sdk_base/meta-environment: Remove overlap from the two
Currently we have the horrible situation where meta-environment packages the toolchain environment files and they get included in the SDK but are broken, then, the SDK code overwrites them with good versions. This is suboptimal. This change fixes the code in meta-environment to create working files and adds in the multilib support from populate_sdk_base, then we remove the code in that base bbclass and rely on the packages being installed if/as/when needed. This removes the duplication and the broken versions of the files, hopefully making all well. [YOCTO #6608] [YOCTO #6613] (From OE-Core rev: 063355e5965439c7b3253d692d7ab0ed1189d123) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/meta/meta-environment.bb35
1 files changed, 28 insertions, 7 deletions
diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb
index c80f8a8808..c6d3bb8d1c 100644
--- a/meta/recipes-core/meta/meta-environment.bb
+++ b/meta/recipes-core/meta/meta-environment.bb
@@ -18,20 +18,41 @@ SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${TARGET_SYS}"
18inherit cross-canadian 18inherit cross-canadian
19 19
20do_generate_content[nostamp] = "1" 20do_generate_content[nostamp] = "1"
21do_generate_content() { 21do_generate_content[cleandirs] = "${SDK_OUTPUT}"
22do_generate_content[dirs] = "${SDK_OUTPUT}/${SDKPATH}"
23python do_generate_content() {
24 # Handle multilibs in the SDK environment, siteconfig, etc files...
25 localdata = bb.data.createCopy(d)
22 26
23 rm -rf ${SDK_OUTPUT} 27 # make sure we only use the WORKDIR value from 'd', or it can change
24 mkdir -p ${SDK_OUTPUT}/${SDKPATH} 28 localdata.setVar('WORKDIR', d.getVar('WORKDIR', True))
25 29
26 toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${REAL_MULTIMACH_TARGET_SYS} 30 # make sure we only use the SDKTARGETSYSROOT value from 'd'
31 localdata.setVar('SDKTARGETSYSROOT', d.getVar('SDKTARGETSYSROOT', True))
27 32
28 toolchain_create_sdk_env_script ${SDK_OUTPUT}/${SDKPATH}/environment-setup-${REAL_MULTIMACH_TARGET_SYS} ${REAL_MULTIMACH_TARGET_SYS} '##SDKTARGETSYSROOT##' ${target_libdir} 33 # Process DEFAULTTUNE
34 bb.build.exec_func("create_sdk_files", localdata)
29 35
30 # Add version information 36 variants = d.getVar("MULTILIB_VARIANTS", True) or ""
31 toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${REAL_MULTIMACH_TARGET_SYS} 37 for item in variants.split():
38 # Load overrides from 'd' to avoid having to reset the value...
39 overrides = d.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item
40 localdata.setVar("OVERRIDES", overrides)
41 bb.data.update_data(localdata)
42 bb.build.exec_func("create_sdk_files", localdata)
32} 43}
33addtask generate_content before do_install after do_compile 44addtask generate_content before do_install after do_compile
34 45
46create_sdk_files() {
47 # Setup site file for external use
48 toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${REAL_MULTIMACH_TARGET_SYS}
49
50 toolchain_create_sdk_env_script ${SDK_OUTPUT}/${SDKPATH}/environment-setup-${REAL_MULTIMACH_TARGET_SYS}
51
52 # Add version information
53 toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${REAL_MULTIMACH_TARGET_SYS}
54}
55
35do_install[nostamp] = "1" 56do_install[nostamp] = "1"
36do_install() { 57do_install() {
37 install -d ${D}/${SDKPATH} 58 install -d ${D}/${SDKPATH}