summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2014-04-11 17:07:39 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-29 13:42:18 +0100
commitaf91e98e32a76da587f3d7bcd4f767767ffe5fdc (patch)
treef8c69ba0f178b1abab3fe411d19b525bd4d16709 /meta
parent46c39b60c57d20eed107a23f61d9591d9f48c8b5 (diff)
downloadpoky-af91e98e32a76da587f3d7bcd4f767767ffe5fdc.tar.gz
icecc: don't create unnecessary 'ice' dirs in sysroots when disabled
* parsing ICE_PATH="${@icc_path(bb, d)}" causes "ice" directories to be created in every sysroot, that could be a bit confusing for people who inherit icecc.bbclass, but disabled it * shorten ICECC_VERSION="${@icc_version(bb, d)}" path a bit by returning sooner when disabled * remove ICECC_PATH and ICECC_ENV_EXEC from signatures, we assume that using icecc doesn't influence the output, so it shouldn't matter when user supplies own version of icecc or env script * always compare ICECC_DISABLED with "1", boolean typed_value isn't used because documentation already mentions using empty value to keep icecc enabled and that's not valid boolean value when oe.data.typed_value is used: ERROR: ICECC_DISABLED: Invalid boolean value '' (From OE-Core rev: c3e8bfe30685e2357a6eb3ba8f4a014c7dc9f58e) (From OE-Core rev: 41aeb447de70b5fb3e1d0ef4aa90376ad5caef4c) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/icecc.bbclass12
1 files changed, 10 insertions, 2 deletions
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass
index 5c9e66c95e..3ec8c0667d 100644
--- a/meta/classes/icecc.bbclass
+++ b/meta/classes/icecc.bbclass
@@ -28,7 +28,7 @@
28#Error checking is kept to minimum so double check any parameters you pass to the class 28#Error checking is kept to minimum so double check any parameters you pass to the class
29########################################################################################### 29###########################################################################################
30 30
31BB_HASHBASE_WHITELIST += "ICECC_PARALLEL_MAKE ICECC_DISABLED ICECC_USER_PACKAGE_BL ICECC_USER_CLASS_BL ICECC_USER_PACKAGE_WL" 31BB_HASHBASE_WHITELIST += "ICECC_PARALLEL_MAKE ICECC_DISABLED ICECC_USER_PACKAGE_BL ICECC_USER_CLASS_BL ICECC_USER_PACKAGE_WL ICECC_PATH ICECC_ENV_EXEC"
32 32
33ICECC_ENV_EXEC ?= "${STAGING_BINDIR_NATIVE}/icecc-create-env" 33ICECC_ENV_EXEC ?= "${STAGING_BINDIR_NATIVE}/icecc-create-env"
34 34
@@ -148,6 +148,10 @@ def icc_is_native(bb, d):
148# Don't pollute allarch signatures with TARGET_FPU 148# Don't pollute allarch signatures with TARGET_FPU
149icc_version[vardepsexclude] += "TARGET_FPU" 149icc_version[vardepsexclude] += "TARGET_FPU"
150def icc_version(bb, d): 150def icc_version(bb, d):
151 if d.getVar('ICECC_DISABLED') == "1":
152 # don't even try it, when explicitly disabled
153 return ""
154
151 if use_icc(bb, d) == "no": 155 if use_icc(bb, d) == "no":
152 return "" 156 return ""
153 157
@@ -175,6 +179,10 @@ def icc_version(bb, d):
175 return tar_file 179 return tar_file
176 180
177def icc_path(bb,d): 181def icc_path(bb,d):
182 if d.getVar('ICECC_DISABLED') == "1":
183 # don't create unnecessary directories when icecc is disabled
184 return
185
178 if icc_is_kernel(bb, d): 186 if icc_is_kernel(bb, d):
179 return create_path( [get_cross_kernel_cc(bb,d), ], bb, d) 187 return create_path( [get_cross_kernel_cc(bb,d), ], bb, d)
180 188
@@ -238,7 +246,7 @@ def set_icecc_env():
238 return 246 return
239 247
240set_icecc_env() { 248set_icecc_env() {
241 if [ "x${ICECC_DISABLED}" != "x" ] 249 if [ "${ICECC_DISABLED}" = "1" ]
242 then 250 then
243 return 251 return
244 fi 252 fi