diff options
author | Joshua Watt <jpewhacker@gmail.com> | 2018-02-12 10:51:56 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-02-15 13:28:54 +0000 |
commit | 6d0d57776716a6619bfaf14ac4abc08d71a13dec (patch) | |
tree | edf2a9ad9a3f055216b77293258b264bd320e1fd | |
parent | 053557091103d1474f2b4fcb175073da689ab9bb (diff) | |
download | poky-6d0d57776716a6619bfaf14ac4abc08d71a13dec.tar.gz |
icecc.bbclass: Move to shared work directory
Generate the icecc toolchains in a shared work directory. This class was
already setup to correctly synchronize creating the toolchains in a
shared location before the RSS changes, so return to that behavior
instead of generated the toolchains in each recipe's sysroot.
Additionally, it makes no sense for each recipe to generate a toolchain,
only to find it was already generated and uploaded to the compile server
by another recipe.
(From OE-Core rev: 20a53ac7818f268d4a4c86c8f35ca982baf96acf)
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/icecc.bbclass | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index 1cc1c4ddb0..e8725b582b 100644 --- a/meta/classes/icecc.bbclass +++ b/meta/classes/icecc.bbclass | |||
@@ -151,6 +151,9 @@ def icecc_is_native(bb, d): | |||
151 | bb.data.inherits_class("cross", d) or \ | 151 | bb.data.inherits_class("cross", d) or \ |
152 | bb.data.inherits_class("native", d); | 152 | bb.data.inherits_class("native", d); |
153 | 153 | ||
154 | def icecc_dir(bb, d): | ||
155 | return d.expand('${TMPDIR}/work-shared/ice') | ||
156 | |||
154 | # Don't pollute allarch signatures with TARGET_FPU | 157 | # Don't pollute allarch signatures with TARGET_FPU |
155 | icecc_version[vardepsexclude] += "TARGET_FPU" | 158 | icecc_version[vardepsexclude] += "TARGET_FPU" |
156 | def icecc_version(bb, d): | 159 | def icecc_version(bb, d): |
@@ -175,8 +178,8 @@ def icecc_version(bb, d): | |||
175 | archive_name += "-kernel" | 178 | archive_name += "-kernel" |
176 | 179 | ||
177 | import socket | 180 | import socket |
178 | ice_dir = d.expand('${STAGING_DIR_NATIVE}${prefix_native}') | 181 | ice_dir = icecc_dir(bb, d) |
179 | tar_file = os.path.join(ice_dir, 'ice', archive_name + "-@VERSION@-" + socket.gethostname() + '.tar.gz') | 182 | tar_file = os.path.join(ice_dir, archive_name + "-@VERSION@-" + socket.gethostname() + '.tar.gz') |
180 | 183 | ||
181 | return tar_file | 184 | return tar_file |
182 | 185 | ||